Merge remote-tracking branch 'origin/master'

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

@@ -1232,6 +1232,113 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
+	 * 项目经理人工审核问题
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void humanReviewTask(Act act) {
+		/*
+		 * pass1 = 设计变更
+		 * pass2 = 项目关闭
+		 * pass3 = 政策处理（城区道路）
+		 * pass4 = 驳回施工单位
+		 * pass5 = 政策处理（农场/民事）
+		 * */
+		boolean pass1 = false;
+		boolean pass2 = false;
+		boolean pass3 = false;
+		boolean pass4 = false;
+		boolean pass5 = false;
+		boolean pass6 = false;
+		boolean pass7 = 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);
+		String flag = act.getFlag();
+		String[] split = flag.split(";");
+		for (String a : split) {
+			if ("pass1".equals(a)) {
+				pass1 = true;
+			} else if ("pass2".equals(a)) {
+				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)){
+				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);
+		}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);
+			}
+		}
+	}
+
+
+	/**
 	 * 配网运行人员设计变更页面
 	 * @param act
 	 */

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

@@ -452,6 +452,25 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功");
 		return j;
 	}
+	/**
+	 * 项目经理人工任何问题
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "humanReviewTask")
+	public AjaxJson humanReviewTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.humanReviewTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
 
 	/**
 	 * 是否可以政策处理（农场/民事）

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/DiscloseMapper.java

@@ -20,4 +20,6 @@ import java.util.List;
 @MyBatisMapper
 public interface DiscloseMapper extends BaseMapper<Disclose> {
     int newInsert(@Param("disclose") List<Disclose> disclose);
+
+    int updateById(Disclose disclose);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/DiscloseMapper.xml

@@ -192,33 +192,66 @@
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks}
-		WHERE id = #{id}
+		WHERE proc_ins_id = #{procInsId}
 	</update>
-
-	<!--<update id="newUpdate">
+	<update id="updateById">
 		UPDATE xm_disclose_conclusion SET
-			powerLine = #{powerLine},
-			blackoutArea = #{blackoutArea},
-			projectType = #{projectType},
-			powerFailure = #{powerFailure},
-			preliminaryJudgment = #{preliminaryJudgment},
-			civilEngineering = #{civilEngineering},
-			baseType = #{baseType},
-			planApproval = #{planApproval},
-			transformationType = #{transformationType},
-			transformationEquipment = #{transformationEquipment},
-			newNamed = #{newNamed},
-			putInto = #{putInto},
-			electricalConstruction = #{electricalConstruction},
-			theAssignment = #{theAssignment},
-			automation = #{automation},
-			remote = #{remote},
-			communicationMode = #{communicationMode},
-			inSitu = #{inSitu},
-			networkCabinet = #{networkCabinet},
-			station = #{station}
-		WHERE id = #{id}
-	</update>-->
+			proc_ins_id = #{procInsId},
+			conId = #{conId},
+			projectNumber= #{projectNumber},
+			projectName= #{projectName},
+			projectId= #{projectId},
+			channel= #{channel},
+			capacity = #{capacity},
+			sceneSize = #{sceneSize},
+			capacitySize = #{capacitySize},
+			hiddenDanger = #{hiddenDanger},
+			influenceConstruction = #{influenceConstruction},
+			projectRepetition = #{projectRepetition},
+			implemented = #{implemented},
+			transformer = #{transformer},
+			explanationOfNecessity = #{explanationOfNecessity},
+			lineName = #{lineName},
+			quantities = #{quantities},
+			rodNumber = #{rodNumber},
+			inconsistentDescription = #{inconsistentDescription},
+			administrationType = #{administrationType},
+			precondition = #{precondition},
+			policyHandlingInstructions = #{policyHandlingInstructions},
+			placementMode = #{placementMode},
+			productionDate = #{productionDate},
+			IntegrateModule = #{IntegrateModule},
+			needReplace = #{needReplace},
+			overallTransformation = #{overallTransformation},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE proc_ins_id = #{procInsId}
+	</update>
+	<!--<update id="newUpdate">-->
+		<!--UPDATE xm_disclose_conclusion SET-->
+			<!--powerLine = #{powerLine},-->
+			<!--blackoutArea = #{blackoutArea},-->
+			<!--projectType = #{projectType},-->
+			<!--powerFailure = #{powerFailure},-->
+			<!--preliminaryJudgment = #{preliminaryJudgment},-->
+			<!--civilEngineering = #{civilEngineering},-->
+			<!--baseType = #{baseType},-->
+			<!--planApproval = #{planApproval},-->
+			<!--transformationType = #{transformationType},-->
+			<!--transformationEquipment = #{transformationEquipment},-->
+			<!--newNamed = #{newNamed},-->
+			<!--putInto = #{putInto},-->
+			<!--electricalConstruction = #{electricalConstruction},-->
+			<!--theAssignment = #{theAssignment},-->
+			<!--automation = #{automation},-->
+			<!--remote = #{remote},-->
+			<!--communicationMode = #{communicationMode},-->
+			<!--inSitu = #{inSitu},-->
+			<!--networkCabinet = #{networkCabinet},-->
+			<!--station = #{station}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
 	
 	<!--物理删除-->
 	<update id="delete">

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/DiscloseService.java

@@ -61,4 +61,10 @@ public class DiscloseService extends CrudService<DiscloseMapper, Disclose> {
 		}
 		return discloseMapper.newInsert(disclose);
 	}
+
+	@Transactional(readOnly = false)
+	public int updateById(Disclose disclose) {
+		disclose.preUpdate();
+		return discloseMapper.updateById(disclose);
+	}
 }

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

@@ -157,27 +157,106 @@ public class MyImportUtils {
         return reurnMap;
     }
 
-    //人工判断：回显
+    //人工审核：回显
     public static void getTheEcho(Construction construction, Model model){
-        //项目关闭
-        if (null!=construction.getDisclose().getExplanationOfNecessity()&&!"".equals(construction.getDisclose().getExplanationOfNecessity())){
-            model.addAttribute("pass_construction1","0");
+        if (null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition())){
+            model.addAttribute("pass_construction6","0");
+        }else {
+            //项目关闭
+            if (null!=construction.getDisclose().getExplanationOfNecessity()&&!"".equals(construction.getDisclose().getExplanationOfNecessity())){//必要性问题说明
+                model.addAttribute("pass_construction1","0");
+            }else {
+                //设计变更
+                if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
+                    if (!"".equals(construction.getDisclose().getInconsistentDescription())){
+                        model.addAttribute("pass_construction2","0");
+                    }else {
+                        if (construction.getDisclose().getAdministrationType().equals("4.无")){
+                            model.addAttribute("pass_construction7","0");
+                        }
+                    }
+                }else {
+                    if (construction.getDisclose().getAdministrationType().equals("4.无")){
+                        model.addAttribute("pass_construction7","0");
+                    }
+                }
+                //农村政处
+                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 String getHumanReviewJudge(Disclose disclose){
+        String tips = "";
+        if ("".equals(disclose.getProjectName()) || disclose.getProjectName() == null) {
+            tips +="项目名称不能为空;";
+        }
+        if ("".equals(disclose.getCapacity()) || disclose.getCapacity() == null||(!"是".equals(disclose.getCapacity())&&!"否".equals(disclose.getCapacity()))) {
+            tips += "设备基础是否可以扩容填写有误;";
+        }
+        if ("".equals(disclose.getHiddenDanger()) || disclose.getHiddenDanger() == null||(!"有".equals(disclose.getHiddenDanger())&&!"无".equals(disclose.getHiddenDanger()))) {
+            tips += "方案安全隐患填写有误;";
         }
-        //设计变更
-        if (null!=construction.getDisclose().getInconsistentDescription()&&!"".equals(construction.getDisclose().getInconsistentDescription())){
-            model.addAttribute("pass_construction2","0");
+        if ("".equals(disclose.getInfluenceConstruction()) || disclose.getInfluenceConstruction() == null||(!"是".equals(disclose.getInfluenceConstruction())&&!"否".equals(disclose.getInfluenceConstruction()))) {
+            tips += "是否存在低压或通信线等影响施工填写有误;";
         }
-        //农村政处
-        if (construction.getDisclose().getAdministrationType().equals("1.农村政处")){
-            model.addAttribute("pass_construction3","0");
+        if ("".equals(disclose.getProjectRepetition()) || disclose.getProjectRepetition() == null||(!"是".equals(disclose.getProjectRepetition())&&!"否".equals(disclose.getProjectRepetition()))) {
+            tips += "立项重复填写有误;";
         }
-        //2.民事政处/行政政处（公路/水利）
-        if (construction.getDisclose().getAdministrationType().equals("2.民事政处/行政政处（公路/水利）")){
-            model.addAttribute("pass_construction4","0");
+        if ("".equals(disclose.getImplemented()) || disclose.getImplemented() == null||(!"是".equals(disclose.getImplemented())&&!"否".equals(disclose.getImplemented()))) {
+            tips += "是否已实施填写有误;";
         }
-        //3.行政政处（城区道路）
-        if (construction.getDisclose().getAdministrationType().equals("3.行政政处（城区道路）")){
-            model.addAttribute("pass_construction5","0");
+        if ("".equals(disclose.getTransformer()) || disclose.getTransformer() == null||(!"有".equals(disclose.getTransformer())&&!"无".equals(disclose.getTransformer()))) {
+            tips += "变压器无负荷填写有误;";
         }
+        if ("有".equals(disclose.getHiddenDanger()) || "是".equals(disclose.getInfluenceConstruction())|| "是".equals(disclose.getProjectRepetition())|| "是".equals(disclose.getImplemented())|| "无".equals(disclose.getTransformer())) {
+            if ("".equals(disclose.getExplanationOfNecessity()) || disclose.getExplanationOfNecessity() == null) {
+                tips += "必要性问题说明不能为空;";
+            }
+        }
+        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
+            tips += "线路名称一致性填写有误;";
+        }
+        if ("".equals(disclose.getQuantities()) || disclose.getQuantities() == null||(!"是".equals(disclose.getQuantities())&&!"否".equals(disclose.getQuantities()))) {
+            tips += "工程量是否一致填写有误;";
+        }
+        if ("".equals(disclose.getRodNumber()) || disclose.getRodNumber() == null||(!"一致".equals(disclose.getRodNumber())&&!"不一致".equals(disclose.getRodNumber()))) {
+            tips += "设备、开关、杆号一致性填写有误;";
+        }
+        if ("不一致".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())||"不一致".equals(disclose.getRodNumber())) {
+            if ("".equals(disclose.getInconsistentDescription()) || disclose.getInconsistentDescription() == 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 += "政策处理说明填写有误;";
+                }
+            }
+        }
+        if ("".equals(disclose.getIntegrateModule()) || disclose.getIntegrateModule() == null||(!"是".equals(disclose.getIntegrateModule())&&!"否".equals(disclose.getIntegrateModule()))) {
+            tips += "二次是否是集成模块填写有误;";
+        }
+        if ("".equals(disclose.getNeedReplace()) || disclose.getNeedReplace() == null||(!"是".equals(disclose.getNeedReplace())&&!"否".equals(disclose.getNeedReplace()))) {
+            tips += "PT是否需要更换填写有误;";
+        }
+        if ("".equals(disclose.getOverallTransformation()) || disclose.getOverallTransformation() == null||(!"是".equals(disclose.getOverallTransformation())&&!"否".equals(disclose.getOverallTransformation()))) {
+            tips += "设备是否有整体改造的必要填写有误;";
+        }
+        return tips;
     }
+
 }

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

@@ -271,14 +271,12 @@ public class ConstructionController extends BaseController {
 //        String pInId = construction.getProcInsId();
 //        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
 //        RepositoryService rs = processEngine.getRepositoryService();
-        System.out.println(construction);
         //根据流程定义号获取所有的定义流程
         MyImportUtils.getTheEcho(construction,model);
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/humanReview";
     }
 
-
     /**
      * 保存请假申请
      */

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

@@ -153,21 +153,23 @@ public class DivideController extends BaseController {
     /**
      * 旧）导入交底结论，正在使用
      * */
-    /*@ResponseBody
+    @ResponseBody
     @RequestMapping(value = "importConclusion")
-    public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId,String projectName) {
+    public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request,String procInsId,String projectName){
+        System.out.println(procInsId);
+        System.out.println(projectName);
         AjaxJson j = new AjaxJson();
         try {
+            projectName = URLDecoder.decode(projectName, "UTF-8");
             int successNum = 0;
             int failureNum = 0;
             StringBuilder failureMsg = new StringBuilder();
             ImportExcel ei = new ImportExcel(file, 1, 0);
             int lastDataRowNum = ei.getLastDataRowNum();
             Disclose disclose = new Disclose();
+            disclose.setProcInsId(procInsId);
             for (int i = 1; i < lastDataRowNum; i++) {
                 Row row = ei.getRow(i);
-                disclose.setProcInsId(procInsId);
-                projectName = URLDecoder.decode(projectName, "UTF-8");
                 String requireName = ei.getCellValue(row, 1).toString();
                 if (projectName.equals(requireName)) {
                     disclose.setRequireName(requireName);
@@ -200,7 +202,19 @@ public class DivideController extends BaseController {
                 }
             }
             try {
-                discloseService.newInsert(disclose);
+                if (null!=disclose.getRequireName()&&!"".equals(disclose.getRequireName())){
+                    String humanReviewJudge = MyImportUtils.getHumanReviewJudge(disclose);
+                    if (!"".equals(humanReviewJudge)){
+                        j.setSuccess(false);
+                        j.setMsg(humanReviewJudge);
+                        return j;
+                    }
+                }else {
+                    j.setSuccess(false);
+                    j.setMsg("导入数据不符合规范");
+                    return j;
+                }
+                discloseService.updateById(disclose);
                 successNum++;
             } catch (Exception ex) {
                 failureNum++;
@@ -216,7 +230,7 @@ public class DivideController extends BaseController {
             j.setMsg("导入失败！失败信息：" + e.getMessage());
         }
         return j;
-    }*/
+    }
 
 
 
@@ -307,10 +321,12 @@ public class DivideController extends BaseController {
                     String precondition = d.getPrecondition();
                     Project user = MyActiviUtils.findUser(d.getProcInsId());
                     if (precondition != null && !"".equals(precondition)) {
+                        vars.put("problem",false);
                         vars.put("pass4", true);
                         vars.put("processer", user.getProjectManageRole());
                     } else {
-                        vars.put("pass4", true);
+                        vars.put("pass4",false);
+                        vars.put("problem", true);
                         vars.put("processer", user.getProjectManageRole());
                     }
                     actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);

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

@@ -14,31 +14,6 @@
             }
         });
 
-
-        $("#agree").click(function () {
-            jp.prompt("备注说明", function (message) {
-                jp.post("${ctx}/act/task/audit3",
-                    {
-                        "taskId": "${construction.act.taskId}",
-                        "taskName": "${construction.act.taskName}",
-                        "taskDefKey": "${construction.act.taskDefKey}",
-                        "procInsId": "${construction.act.procInsId}",
-                        "procDefId": "${construction.act.procDefId}",
-                        "flag": "yes",
-                        "comment": window.encodeURI(message)
-                    },
-                    function (data) {
-                        if (data.success) {
-                            jp.success(data.msg);
-                            jp.go("${ctx}/act/task/todo")
-                        }else {
-                            jp.error(data.msg);
-                        }
-                    })
-            })
-        })
-
-
         $('#startTime').datetimepicker({
             format: "YYYY-MM-DD HH:mm:ss"
         });
@@ -61,6 +36,7 @@
          * 导入交底结论
          * */
         $("#importConclusion").click(function () {
+            var projectId = $("#id").val();
             var procInsId = $("#procInsId").val();
             var projectName = $("#projectName").val();
             jp.open({
@@ -72,10 +48,10 @@
                 btn: ['确定', '关闭'],
                 btn1: function (index, layero) {
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion?procInsId='+procInsId+"&projectName="+projectName, function (data) {
+                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion?procInsId='+procInsId+"&projectName="+encodeURI(encodeURI(projectName)), function (data) {
                         if (data.success) {
                             jp.alert(data.msg);
-                            jp.go("${ctx}/managementcenter/activiti/humanReview")
+                            location.reload();
                         } else {
                             jp.alert(data.msg);
                         }

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

@@ -11,8 +11,8 @@
 		$(document).ready(function () {
 			var a = $("#percondition").val();
 			if (a!="undefined"&&a!=null&&a!="") {
-				$("#no").css("display", "none");
-			}
+                $("#no").css("display", "none");
+            }
 			$("#agree").click(function () {
 				var cValue ="";//定义一个数组
 				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
@@ -20,29 +20,36 @@
 				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
 				var flag5 = false;//代表是否选择了农村政处
 				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
+				var flag7 = false;//代表是否选择了人工判断
+				var flag8 = false;//代表无问题
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
-					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
-					if ("pass2" == $(this).val()) {
-						flag2 = true;
-					}else {
-						flag1 = true;
+                    //判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
+					if ("pass8" == $(this).val()){
+					    flag8 = true;
 					}
-					//判断值为pass3，代表选择了政策处理 行政政处（城区道路）
-					if ("pass3"==$(this).val()) {
-						flag3 = true;
-					}
-					//判断值为pass5，代表选择了农村政处
-					if ("pass5"==$(this).val()) {
-						flag5 = true;
-					}
-					//判断值为pass6，民事政处/行政政处（公路/水利）
-					if ("pass6"==$(this).val()) {
-						flag6 = true;
+					if ("pass7"==$(this).val()){
+					    flag7 = true;
 					}
+                    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){
@@ -51,7 +58,7 @@
 					jp.error("政处类型只能选择一种");
 				}else {
 					jp.prompt(" 审批意见", function (message) {
-						jp.post("${ctx}/act/task/artificialTask",
+						jp.post("${ctx}/act/task/humanReviewTask",
 						{
 							"taskId":"${construction.act.taskId}",
 							"taskName":"${construction.act.taskName}",
@@ -104,6 +111,8 @@
 									<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="pass8"  <c:if test="${pass_construction7=='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"> 人工判断
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/materialplan/materialplanList.js

@@ -110,6 +110,21 @@ $(document).ready(function() {
                             }
                         }(i));
                     }
+
+                    jQuery(function(){
+                        //使用id选择器;例如:tab对象->tr->td对象.
+                        $("#materialPlanTable tr td").each(function(i){
+                            //获取td当前对象的文本,如果长度大于25;
+                            if($(this).text().length>10){
+                                //给td设置title属性,并且设置td的完整值.给title属性.
+                                $(this).attr("title",$(this).text());
+                                //获取td的值,进行截取。赋值给text变量保存.
+                                var text=$(this).text().substring(0,10)+"...";
+                                //重新为td赋值;
+                                $(this).text(text);
+                            }
+                        });
+                    });
                 },
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
@@ -371,6 +386,4 @@ $(document).ready(function() {
         jp.openViewDialog('查看物料计划表单', "${ctx}/sg/managementcenter/materialplan/form?id=" + id, '800px', '500px');
  }
 
-
-
 </script>