Merge branch 'master' of E:\java_code\sg_audit9 with conflicts.

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

@@ -59,6 +59,6 @@ public class DiscloseService extends CrudService<DiscloseMapper, Disclose> {
 		for (Disclose d : disclose) {
 			d.preInsert();
 		}
-		 return discloseMapper.newInsert(disclose);
+		return discloseMapper.newInsert(disclose);
 	}
 }

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

@@ -4,9 +4,11 @@ import com.google.common.collect.Maps;
 import com.google.gson.internal.$Gson$Preconditions;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import org.apache.poi.ss.usermodel.Row;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -155,4 +157,27 @@ 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().getInconsistentDescription()&&!"".equals(construction.getDisclose().getInconsistentDescription())){
+            model.addAttribute("pass_construction2","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");
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
 import java.util.*;
 
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sys.entity.User;
 
 import com.google.common.collect.Maps;
@@ -67,12 +68,49 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "form/{mode}")
     public String form(@PathVariable String mode, Construction construction, Model model) {
+//        String proId = construction.getAct().getProcDefId();
+//        String pInId = construction.getProcInsId();
+//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+//        RepositoryService rs = processEngine.getRepositoryService();
         //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
 //		model.addAttribute("roleCodes");
         if ("add".equals(mode) || "edit".equals(mode)) {
             return "modules/sg/managementcenter/activiti/constructionForm";
         } else {//audit(施工单位，项目经理组织交底)
+           /* List<Task> tasks = taskService.createTaskQuery().processInstanceId(pInId).list();
+            //对流程循环
+            for (Task task : tasks) {
+                //根据流程的定义号获取信息
+                ProcessDefinitionEntity def = (ProcessDefinitionEntity) ((RepositoryServiceImpl) rs).getDeployedProcessDefinition(task.getProcessDefinitionId());
+                //获取流程中所有的节点信息
+                List<ActivityImpl> activitiList = def.getActivities();  //rs是指RepositoryService的实例
+                String excId = task.getExecutionId();
+                ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(excId).singleResult();
+                //获取当前节点id
+                String activitiId = execution.getActivityId();
+                for (ActivityImpl activityImpl : activitiList) {
+                    String id = activityImpl.getId();
+                    if (activitiId.equals(id)) {
+                        System.out.println("当前任务：" + activityImpl.getProperty("name")); //输出某个节点的某种属性
+                        List<PvmTransition> outTransitions = activityImpl.getOutgoingTransitions();//获取从某个节点出来的所有线路
+                        for (PvmTransition tr : outTransitions) {
+                            PvmActivity ac = tr.getDestination();//获取线路的终点节点
+                            List<PvmTransition> outgoingTransitions = ac.getOutgoingTransitions();
+                            for (PvmTransition tr2 : outgoingTransitions) {
+                                PvmActivity ac2 = tr2.getDestination();//获取线路的终点节点
+                                ActivityImpl activityImpl2 = def.findActivity(ac2.getId());
+                                TaskDefinition taskDef = (TaskDefinition) activityImpl2.getProperties().get("taskDefinition");
+                                if (taskDef != null) {
+                                    Set<Expression> roleCodes = taskDef.getCandidateGroupIdExpressions();//候选组
+                                    System.out.println("候选组是" + roleCodes.toString());
+                                }
+                            }
+                        }
+                        break;
+                    }
+                }
+            }*/
             return "modules/sg/managementcenter/activiti/constructionAudit";
         }
 
@@ -96,8 +134,30 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 配网运行人员判定设计变更
+     * 人工审核页面
      * */
+    /**
+     * 查看，增加，编辑请假申请表单页面
+     */
+    @RequestMapping(value = "humanReview")
+    public String humanReviewform(Construction construction, Model model) {
+//        String proId = construction.getAct().getProcDefId();
+//        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";
+    }
+
+    /**
+     * 配网运行人员
+     * */
+    /**
+     * 查看，增加，编辑请假申请表单页面
+     */
     @RequestMapping(value = "operatorDesignChange")
     public String form3(Construction construction, Model model) {
         //根据流程定义号获取所有的定义流程
@@ -257,7 +317,9 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/documentsForm";
     }
 
+    public void updateStatus(String status, String id) {
 
+    }
 
     /**
      * 保存请假申请
@@ -301,7 +363,7 @@ public class ConstructionController extends BaseController {
         List<Project> listById = projectService.findListById(proListId);
         //循环项目信息
             for (Project each : listById) {
-                //从项目信息种获取交底类型
+                //从项目信息种获取施工单位字段
                 constructionUnit = each.getClarificaitonType();
                 //如果施工单位不为空，系统判读施工单位交底
                 if ("施工单位自行交底".equals(constructionUnit)) {
@@ -315,7 +377,7 @@ public class ConstructionController extends BaseController {
                         //有此用户-施工单位交底
                         vars.put("company", true);
                         vars.put("manager", false);
-                        vars.put("processer", constructionUnitRole);
+                        vars.put("processer", "项目经理A");
                         String id = each.getId();
                         construction.setApplyName(constructionUnitRole);
                         construction.setProjectId(id);

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

@@ -152,10 +152,11 @@ 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) {
         AjaxJson j = new AjaxJson();
+        List<Disclose> discloseList = new ArrayList<>();
         try {
             int successNum = 0;
             int failureNum = 0;
@@ -196,10 +197,11 @@ public class DivideController extends BaseController {
                     disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
                     disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
                     disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
+                    discloseList.add(disclose);
                 }
             }
             try {
-                discloseService.newInsert(disclose);
+                discloseService.newInsert(discloseList);
                 successNum++;
             } catch (Exception ex) {
                 failureNum++;
@@ -215,7 +217,7 @@ public class DivideController extends BaseController {
             j.setMsg("导入失败！失败信息：" + e.getMessage());
         }
         return j;
-    }*/
+    }
 
 
 
@@ -305,11 +307,13 @@ public class DivideController extends BaseController {
                     Map<String, Object> vars = Maps.newHashMap();
                     String precondition = d.getPrecondition();
                     if (precondition != null && !"".equals(precondition)) {
+                        vars.put("problem", false);
                         vars.put("pass4", true);
                         vars.put("processer", "项目经理");
                     } else {
-                        vars.put("pass4", true);
-                        vars.put("processer", "项目经理");
+                        vars.put("pass4", false);
+                        vars.put("problem", true);
+                        vars.put("processer", "项目经理A");
                     }
                     actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);
                 }

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-#redis.hosts = 127.0.0.1:6379
-redis.hosts = 192.168.2.4:6380
+redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6380
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,10 +14,10 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
-jdbc.password=root
+jdbc.password=123456
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 

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

@@ -113,23 +113,12 @@
 						<input id="percondition" type="hidden" value="${construction.disclose.precondition}">
 						<table class="table table-bordered">
 							<tbody>
-<%--							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.userName)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</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}"
-													cssClass="form-control required"/>
-								</td>
-							</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
 								<td class="width-35">
-									<input type="checkbox" name="favorite" value="pass1" checked> 设计变更 &nbsp;
-									<input type="checkbox" name="favorite" value="pass2" checked> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3" checked> 行政政处（城区道路）
+									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"> 行政政处（城区道路）
 									<input type="checkbox" name="favorite" value="pass5"> 农村政处
 									<input type="checkbox" name="favorite" value="pass6"> 民事政处/行政政处（公路/水利）
 								</td>

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

@@ -0,0 +1,93 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+	<script>
+    /**
+     * 项目经理组织交底页面
+     * */
+    $(document).ready(function () {
+        jp.ajaxForm("#inputForm", function (data) {
+            if (data.success) {
+                jp.success(data.msg);
+                jp.go("${ctx}/managementcenter/divide");
+            } else {
+                jp.error(data.msg);
+                $("#inputForm").find("button:submit").button("reset");
+            }
+        });
+
+
+        $("#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"
+        });
+        $('#endTime').datetimepicker({
+            format: "YYYY-MM-DD HH:mm:ss"
+        });
+        //富文本初始化
+        $('#reason').summernote({
+            height: 300,
+            lang: 'zh-CN',
+            readonly: true,
+            callbacks: {
+                onChange: function (contents, $editable) {
+                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+                }
+            }
+        });
+
+        /**
+         * 导入交底结论
+         * */
+        $("#importConclusion").click(function () {
+            var procInsId = $("#procInsId").val();
+            var projectName = $("#projectName").val();
+            jp.open({
+                type: 2,
+                area: [500, 200],
+                auto: true,
+                title: "导入交底结论",
+                content: "${ctx}/tag/importExcel",
+                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) {
+                        if (data.success) {
+                            jp.alert(data.msg);
+                            jp.go("${ctx}/managementcenter/activiti/humanReview")
+                        } else {
+                            jp.alert(data.msg);
+                        }
+                        jp.close(index);
+                    });//调用保存事件
+                    return false;
+                },
+                btn2: function (index) {
+                    jp.close(index);
+                }
+            });
+        });
+
+    })
+</script>

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

@@ -0,0 +1,357 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目经理人工判断页面</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="humanReview.js"%>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			var a = $("#percondition").val();
+			if (a!="undefined"&&a!=null&&a!="") {
+				$("#no").css("display", "none");
+			}
+			$("#agree").click(function () {
+				var cValue ="";//定义一个数组
+				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
+				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
+				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
+				var flag5 = false;//代表是否选择了农村政处
+				var flag6 = 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;
+					}
+					//判断值为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 {
+					jp.prompt(" 审批意见", function (message) {
+						jp.post("${ctx}/act/task/artificialTask",
+						{
+							"taskId":"${construction.act.taskId}",
+							"taskName":"${construction.act.taskName}",
+							"taskDefKey":"${construction.act.taskDefKey}",
+							"procInsId":"${construction.act.procInsId}",
+							"procDefId":"${construction.act.procDefId}",
+							"flag":cValue,
+							"projectName":"${fns:unescapeHtml(construction.projectName)}",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
+			});
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<button id="importConclusion" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入交地结论
+					</button>
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
+						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+						<input id="percondition" type="hidden" value="${construction.disclose.precondition}">
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
+								<td class="width-35">
+									<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"> 民事政处/行政政处（公路/水利）
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<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">
+										${fns:unescapeHtml(construction.examineDate)}
+								</td>--%>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.blackoutArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.preliminaryJudgment)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.civilEngineering)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.baseType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.planApproval)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationType)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.transformationEquipment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.newNamed)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.putInto)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.electricalConstruction)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.theAssignment)}
+							</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.automation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.remote)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.communicationMode)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.inSitu)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.networkCabinet)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.station)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.powerFailure)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
+								<td class="width-35">
+										${construction.disclose.channel}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacity}
+										<%--<select id="capacity"  maxlength="100"  class=" form-control">
+										<option value="是">是</option>
+										<option value="否">否</option>
+									</select>--%>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.sceneSize}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+										${construction.disclose.capacitySize}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+										${construction.disclose.hiddenDanger}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+										${construction.disclose.influenceConstruction}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+										${construction.disclose.projectRepetition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+										${construction.disclose.implemented}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+										${construction.disclose.transformer}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+										${construction.disclose.quantities}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.rodNumber}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<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">
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+										${construction.disclose.precondition}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+										${construction.disclose.placementMode}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+										${construction.disclose.productionDate}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+										${construction.disclose.integrateModule}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+										${construction.disclose.needReplace}
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+										${construction.disclose.overallTransformation}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<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;
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -12,7 +12,7 @@
 			margin-top: 10px;
 		}
 		.well-class-body{
-			width: 160px;
+			width: 150px;
 			word-wrap: break-word;
 			word-break: break-all;
 			/*text-align: right;*/
@@ -70,13 +70,13 @@
 								<c:if test="${status.count eq 1 || (status.count-1) % 4 eq 0}">
 									<tr>
 								</c:if>
-								<td style="text-align:center;vertical-align:middle;">
+								<td style="text-align: center;vertical-align: middle">
 										<div class="well-class-body" style="float: left;">
 											<a href="javascript:jp.openViewDialog('模块清单','${ctx}/managementcenter/moduleacquisition/moduleListing/list?blockId=${itemss.id}', '800px', '500px');">
 												${itemss.name}
 											</a>
 										</div>
-										<div style="float: left;">
+										<div style="float: left;margin-left: 5px;margin: auto">
 											<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
 										</div>
 								</td>