Merge remote-tracking branch 'origin/master'

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

@@ -1381,7 +1381,7 @@ public class ActTaskService extends BaseService {
 					vars.put("coveredPerson","施工单位");
 					vars.put("pass3",true);
 				}
-				if (!flagDesign&&!flagItemCLose&&"空".equals(flagDeal)){
+				if (!flagDesign&&!flagItemCLose&&"init".equals(flagDeal)){
 					vars.put("pass",true);
 				}
 			}
@@ -2110,14 +2110,13 @@ public class ActTaskService extends BaseService {
 		return flag;
 	}
 	public String  newJudgeDeal(Disclose disclose){
-		String flag = "空";
+		String flag = "init";
+		String a = "";
 		if (null!=disclose.getAdministrationType()){
 			if (disclose.getAdministrationType().contains("民事政处")||disclose.getAdministrationType().contains("农村政处")){
 				flag = "民事农村";
 			} else if (disclose.getAdministrationType().contains("行政政处(城区道路)")) {
 				flag = "行政";
-			} else {
-				flag = "空";
 			}
 		}
 //		if (null!)

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

@@ -758,14 +758,10 @@ public class ActTaskController extends BaseController {
 			}
 			if (flagDesign){
 				if (null==disclose.getInconsistentDescription()||disclose.getExplanationOfNecessity().equals("")){
-					s+=" 图纸现场不一致说明不能为空!";
+					s+="图纸现场不一致说明不能为空!";
 					flag = true;
 				}
 			}
-			if ("空".equals(flagDeal)) {
-				s += "政策类型不能为空";
-				flag = true;
-			}
 /*			if (flagDeal){
 				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
 					s+=" 政策处理说明不能为空!";

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

@@ -219,18 +219,18 @@ public class DivideController extends BaseController {
 			try {
 				discloseService.newInsert(disclose);
 				successNum++;
-			} catch (ConstraintViolationException ex) {
-				failureNum++;
 			} catch (Exception ex) {
 				failureNum++;
+				ex.printStackTrace();
 			}
 			if (failureNum > 0) {
-				failureMsg.insert(0, "，失败 " + failureNum + " 条票务代理记录。");
+				failureMsg.insert(0, "，失败 " + failureNum + " 记录。");
 			}
-			j.setMsg("已成功导入 " + successNum + " 条票务代理记录" + failureMsg);
+			j.setMsg("已成功导入 " + successNum + " 记录" + failureMsg);
 		} catch (Exception e) {
+			e.printStackTrace();
 			j.setSuccess(false);
-			j.setMsg("导入票务代理失败！失败信息：" + e.getMessage());
+			j.setMsg("导入失败！失败信息：" + e.getMessage());
 		}
 		return j;
 	}

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

@@ -314,7 +314,6 @@
 								</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>