Merge remote-tracking branch 'origin/master'

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

@@ -1371,24 +1371,22 @@ public class ActTaskService extends BaseService {
 		 * pass3 = 政策处理（城区道路）
 		 * pass4 = 驳回施工单位
 		 * pass5 = 政策处理（农场/民事）
+		 * pass7 = 无问题
 		 * */
-		boolean pass1 = false;
-		boolean pass2 = false;
-		boolean pass3 = false;
-		boolean pass4 = false;
-		boolean pass5 = false;
-		boolean pass6 = false;
+		boolean pass1 = false;//设计变更
+		boolean pass2 = false;//项目关闭
+		boolean pass3 = false;//行政证处
+		boolean pass5 = false;//农村证处
 		boolean pass7 = false;//无问题
+		boolean countryside = false;//民事行政
 		Map<String, Object> vars = Maps.newHashMap();
 		//pass对应进入问题模块，pass4对应没有问题完成施工交底
 		vars.put("pass", false);
-		vars.put("pass4", false);
-
 		vars.put("pass1", false);
 		vars.put("pass2", false);
 		vars.put("pass3", false);
 		vars.put("pass5", false);
-		vars.put("pass6",false);
+		vars.put("countryside",false);//性质民事
 		String flag = act.getFlag();
 		String[] split = flag.split(";");
 		for (String a : split) {
@@ -1398,71 +1396,49 @@ public class ActTaskService extends BaseService {
 				pass2 = true;
 			} else if ("pass3".equals(a)) {
 				pass3 = true;
-			} else if ("pass4".equals(a)) {
-				pass4 = true;
 			} else if ("pass5".equals(a)) {
 				pass5 = true;
 			} else if ("pass6".equals(a)) {
-				pass5 = true;
-			}else if ("pass7".equals(a)){
-				pass6 = true;
-			}else if ("pass8".equals(a)){
+				countryside = true;
+			} else if ("pass7".equals(a)) {
 				pass7 = true;
 			}
 		}
-		if (pass6){
-			act.setComment("[人工判断]" + act.getComment());
-			act.preUpdate();
-			// 对不同环节的业务逻辑进行操作
-			String taskDefKey = act.getTaskDefKey();
-			// 提交流程任务
-			Project user = MyActiviUtils.findUser(act.getProcInsId());
-			vars.put("processer", user.getProjectManageRole());
-			vars.put("pass6", true);
-			complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+		if (pass7){
+			vars.put("pass", true);
+			act.setComment("[完成施工交底]" + act.getComment());
 		}else {
-			if (pass4) {
-				act.setComment("[完成施工交底]" + act.getComment());
-				act.preUpdate();
-				// 对不同环节的业务逻辑进行操作
-				String taskDefKey = act.getTaskDefKey();
-				// 提交流程任务
-				String processer = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:施工单位组织交底");
-				vars.put("processer", processer);
-				vars.put("pass4", true);
-				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
-			} else {
-				if (pass1) {
-					vars.put("pass1", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
-					vars.put("design", user.getRunUnitRole());
-				}
-				if (pass2) {
-					vars.put("pass2", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
-					vars.put("itemClose", user.getDistributionEngineering());
-				}
-				if (pass3) {
-					vars.put("pass3", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
-					vars.put("coveredPerson", user.getConstructionUnitRole());
-				}
-				if (pass5) {
-					vars.put("pass5", true);
-					Project user = MyActiviUtils.findUser(act.getProcInsId());
-					vars.put("policy", user.getDistributionPolicy());
-				}
-				if (pass7){
-					vars.put("pass", true);
-					act.setComment("[存在问题]" + act.getComment());
-				}
-				act.preUpdate();
-				// 对不同环节的业务逻辑进行操作
-				String taskDefKey = act.getTaskDefKey();
-				// 提交流程任务
-				complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+			if (pass1) {
+				vars.put("pass1", true);
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("design", user.getRunUnitRole());
+			}
+			if (pass2) {
+				vars.put("pass2", true);
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("itemClose", user.getDistributionEngineering());//配网工程专职角色
+			}
+			if (pass3) {
+				vars.put("pass3", true);
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("coveredPerson", user.getConstructionUnitRole());//施工单位角色
+			}
+			if (pass5) {
+				vars.put("pass5", true);
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("policy", user.getDistributionPolicy());//配网政策处理专职角色
+			}
+			if (countryside){
+				vars.put("countryside", true);
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("policy", user.getDistributionPolicy());//配网政策处理专职角色
 			}
 		}
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
 

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -206,21 +206,65 @@ public class MyImportUtils {
                         model.addAttribute("pass_construction7","0");
                     }
                 }
-                //农村政处
-                if (construction.getDisclose().getAdministrationType().equals("1.农村政处")){
+                getAdministrationTypeView(construction.getDisclose().getAdministrationType(),model);
+//                //农村政处
+//                if (construction.getDisclose().getAdministrationType().equals("1.农村政处")){
+//                    model.addAttribute("pass_construction3","0");
+//                }
+//                //2.民事政处/行政政处（公路/水利）
+//                if (construction.getDisclose().getAdministrationType().equals("2.民事政处/行政政处（公路/水利）")){
+//                    model.addAttribute("pass_construction4","0");
+//                }
+//                //3.行政政处（城区道路）
+//                if (construction.getDisclose().getAdministrationType().equals("3.行政政处（城区道路）")){
+//                    model.addAttribute("pass_construction5","0");
+//                }
+            }
+        }
+    }
+    //政策处理类型判断
+    public static void getAdministrationTypeView(String administrationType,Model model){
+        if (administrationType.length()>0){
+            String[] split = administrationType.split(";");
+            for (String str:split){
+                if (str.equals("1.农村政处")){
                     model.addAttribute("pass_construction3","0");
                 }
                 //2.民事政处/行政政处（公路/水利）
-                if (construction.getDisclose().getAdministrationType().equals("2.民事政处/行政政处（公路/水利）")){
+                if (str.equals("2.民事政处/行政政处（公路/水利）")){
                     model.addAttribute("pass_construction4","0");
                 }
                 //3.行政政处（城区道路）
-                if (construction.getDisclose().getAdministrationType().equals("3.行政政处（城区道路）")){
+                if (str.equals("3.行政政处（城区道路）")){
                     model.addAttribute("pass_construction5","0");
                 }
             }
         }
     }
+    //政策处理类型判断
+    public static String getAdministrationJudge(Disclose disclose,String tips){
+        if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null) {
+            tips += "政处类型填写有误;";
+            return tips;
+        }
+        boolean flag = true;
+        String[] split = disclose.getAdministrationType().split(";");
+        for (String str : split){
+            if (!str.equals("1.农村政处")&&!str.equals("2.民事政处/行政政处（公路/水利）")&&!str.equals("3.行政政处（城区道路）")&&!str.equals("4.无")){
+                tips+="政处类型填写有误";
+                flag = false;
+                break;
+            }
+        }
+        if (flag){
+            if (!disclose.getAdministrationType().contains("4.无")){
+                if ("".equals(disclose.getPolicyHandlingInstructions()) || disclose.getPolicyHandlingInstructions() == null) {
+                    tips += "政策处理说明填写有误;";
+                }
+            }
+        }
+        return tips;
+    }
     //人工审核：判断
     public static String getHumanReviewJudge(Disclose disclose){
         String tips = "";
@@ -273,15 +317,16 @@ public class MyImportUtils {
                 tips += "图纸现场不一致说明不能为空;";
             }
         }
-        if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null||(!"1.农村政处".equals(disclose.getAdministrationType())&&!"2.民事政处/行政政处（公路/水利）".equals(disclose.getAdministrationType())&&!"3.行政政处（城区道路）".equals(disclose.getAdministrationType())&&!"4.无".equals(disclose.getAdministrationType()))) {
-            tips += "政处类型填写有误;";
-        }else {
-            if (("1.农村政处".equals(disclose.getAdministrationType())&&"2.民事政处/行政政处（公路/水利）".equals(disclose.getAdministrationType())&&"3.行政政处（城区道路）".equals(disclose.getAdministrationType()))) {
-                if ("".equals(disclose.getPolicyHandlingInstructions()) || disclose.getPolicyHandlingInstructions() == null) {
-                    tips += "政策处理说明填写有误;";
-                }
-            }
-        }
+//        if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null||(!"1.农村政处".equals(disclose.getAdministrationType())&&!"2.民事政处/行政政处（公路/水利）".equals(disclose.getAdministrationType())&&!"3.行政政处（城区道路）".equals(disclose.getAdministrationType())&&!"4.无".equals(disclose.getAdministrationType()))) {
+////            tips += "政处类型填写有误;";
+////        }else {
+////            if (("1.农村政处".equals(disclose.getAdministrationType())||"2.民事政处/行政政处（公路/水利）".equals(disclose.getAdministrationType())||"3.行政政处（城区道路）".equals(disclose.getAdministrationType()))) {
+////                if ("".equals(disclose.getPolicyHandlingInstructions()) || disclose.getPolicyHandlingInstructions() == null) {
+////                    tips += "政策处理说明填写有误;";
+////                }
+////            }
+////        }
+        tips = getAdministrationJudge(disclose, tips);
         //DTU  安放方式检查
         if ("".equals(disclose.getPlacementMode())||disclose.getPlacementMode() == null||(!"户外".equals(disclose.getPlacementMode())&&!"户内".equals(disclose.getPlacementMode())&&!"无".equals(disclose.getPlacementMode()))){
             tips+="DTU安放方式核查填写有误";

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -338,6 +338,11 @@ public class ModuleBlockWeb extends BaseController {
 	public AjaxJson selectVersionEdit(String version, Model model,HttpServletRequest request){
 		AjaxJson j = new AjaxJson();
 		//新增或编辑表单保存
+		try {
+			version = URLDecoder.decode(version, "UTF-8");
+		}catch (Exception e){
+			e.printStackTrace();
+		}
 		pickIngService.updateSelectVersion(version);
 		j.setSuccess(true);
 		j.setMsg("保存版本成功");

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

@@ -17,46 +17,30 @@
 				var cValue ="";//定义一个数组
 				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
 				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
-				var flag5 = false;//代表是否选择了农村政处
-				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
-				var flag7 = false;//代表是否选择了人工判断
-				var flag8 = false;//代表无问题
+				var flagNo= false;//代表是否选择无问题之外的类型
+				var flag7 = false;//代表是否选择了无问题
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
                     //判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
-					if ("pass8" == $(this).val()){
-					    flag8 = true;
-					}
-					if ("pass7"==$(this).val()){
+					if ("pass7"==$(this).val()){//无问题
 					    flag7 = true;
+					}else {
+						flagNo = true;
 					}
-                    if ("pass2" == $(this).val()) {
+                    if ("pass2" == $(this).val()) {//项目关闭
                         flag2 = true;
                     }else {
                         flag1 = true;
                     }
-                    //判断值为pass3，代表选择了政策处理 行政政处（城区道路）
-                    if ("pass3"==$(this).val()) {
-                        flag3 = true;
-                    }
-                    //判断值为pass5，代表选择了农村政处
-                    if ("pass5"==$(this).val()) {
-                        flag5 = true;
-                    }
-                    //判断值为pass6，民事政处/行政政处（公路/水利）
-                    if ("pass6"==$(this).val()) {
-                        flag6 = true;
-                    }
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
 				if (nValue == null || nValue.size() <= 0) {
 					jp.error("请选择问题类型");
 				} else if(flag1==true&&flag2==true){
 					jp.error("项目关闭与其它类型问题不可同时发起");
-				}else if ((flag3==true&&flag5==true)||(flag3==true&&flag6==true)||(flag5==true&&flag6==true)){
-					jp.error("政处类型只能选择一种");
-				}else {
+				}else if (flag7&&flagNo){
+                    jp.error("无问题与其他类型不可同时发起")
+				} else {
 					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/humanReviewTask",
 						{
@@ -106,13 +90,12 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
 								<td class="width-35">
-									<input type="checkbox" name="favorite" value="pass8"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if> onclick="return false"> 无问题 &nbsp;
-									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if> onclick="return false"> 设计变更 &nbsp;
-									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if> onclick="return false"> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if> onclick="return false"> 行政政处（城区道路）
-									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if> onclick="return false"> 农村政处
-									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> onclick="return false"> 民事政处/行政政处（公路/水利）
-									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction6=='0'}">checked="checked"</c:if> onclick="return false"> 人工判断
+									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 无问题 &nbsp;
+									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 行政政处（城区道路）
+									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 农村政处
+									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 民事政处/行政政处（公路/水利）
 								</td>
 								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
 								<td class="width-35">

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

@@ -260,10 +260,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/moduleacquisition/moduleVersionList.jsp

@@ -28,7 +28,7 @@
 <body>
 	<div class="wrapper wrapper-content">
 		<div class="panel panel-primary">
-			<div id="searchForm" class="form form-horizontal well clearfix">
+			<div id="searchForm" class="form form-horizontal well clearfix" style="margin-bottom: 0px">
 				<div class="accordion-inner">
 				<div class="col-xs-12 col-sm-6 col-md-4">
 					<label class="label-item single-overflow pull-left" title="版本名称：">新版本名称：</label>
@@ -40,7 +40,9 @@
 				</div>
 				</div>
 			</div>
-			<table id="moduleVersionTable" style="margin-top: 2px"  data-toolbar="#toolbar"></table>
+			<div style="margin-left: 8px;margin-right: 8px">
+				<table id="moduleVersionTable" style=""  data-toolbar="#toolbar"></table>
+			</div>
 		</div>
 	</div>
 </body>

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/selectVersion.jsp

@@ -23,7 +23,7 @@
 				jp.error("请选择您想变更的版本号");
 			}else{
 				jp.loading();
-				jp.post("${ctx}/managementcenter/moduleacquisition/selectVersionSave?version="+selectVersion,null,function(data){
+				jp.post("${ctx}/managementcenter/moduleacquisition/selectVersionSave?version="+encodeURI(encodeURI(selectVersion)),null,function(data){
 					if(data.success){
 						var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
 						parent.layer.close(dialogIndex);