Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,9 @@ import java.io.InputStream;
 import java.util.*;
 
 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.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -89,7 +92,10 @@ public class ActTaskService extends BaseService {
 	private RepositoryService repositoryService;
 	@Autowired
 	private IdentityService identityService;
-	
+	@Autowired
+	private ConstructionService constructionService;
+	@Autowired
+	private DiscloseService discloseService;
 	/**
 	 * 获取待办任务列表
 	 * @return
@@ -1088,7 +1094,7 @@ public class ActTaskService extends BaseService {
 
 
 	/**
-	 * 经理保存审核意见
+	 * 施工保存审核意见
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1105,41 +1111,67 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
+	 * 经理保存审核意见
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void auditSave3(Act act, Disclose disclose) {
+
+		// 设置意见
+		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[存在问题] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		discloseService.save(disclose);
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
 	 * 保存审核意见
 	 *
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void newAuditSave(Act act, Construction construction) {
+	public void newAuditSave(Act act,String tuser,Construction construction) {
 
 		// 设置意见
+//		constructionService.save(construction);
 		if ("manager".equals(act.getFlag())) {
-			act.setComment("[项目经理]");
+			act.setComment(act.getComment());
 		} else if ("company".equals(act.getFlag())) {
-			act.setComment("[施工单位]");
+			act.setComment(act.getComment());
 		} else {
-			act.setComment("[驳回]");
+			act.setComment(act.getComment());
 		}
 		/*		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());*/
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
-		Map<String, Object> vars = Maps.newHashMap();
-		if ("manager".equals(act.getFlag())) {
+//		Map<String, Object> vars = Maps.newHashMap();
+		Map<String, Object> vars = new HashMap<>();
+		String flag = act.getFlag();
+		if ("manager".equals(flag)) {
 			vars.put("manager", true);
 			vars.put("company", false);
 			vars.put("reject", false);
-		} else if ("company".equals(act.getFlag())) {
+			String loginName = UserUtils.getByLoginName(tuser).getLoginName();
+			vars.put("processer", loginName);
+		} else if ("company".equals(flag)) {
 			vars.put("manager", false);
 			vars.put("company", true);
 			vars.put("reject", false);
+			vars.put("processer", UserUtils.getUser().getLoginName());
 		} else {
 			vars.put("manager", false);
 			vars.put("company", false);
 			vars.put("reject", true);
 		}
-		vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
+		constructionService.newUpdate(construction);
+//		vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
 		/*vars.put("pass", "yes".equals(act.getFlag())? true : false);*/
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

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

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -369,7 +370,7 @@ public class ActTaskController extends BaseController {
 
 
 	/**
-	 * 审批
+	 * 施工审批
 	 * @param act
 	 */
 	@ResponseBody
@@ -381,6 +382,19 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 经理审批
+	 * @param act
+	 */
+	@ResponseBody
+	@RequestMapping(value = "audit3")
+	public AjaxJson auditTask3(Act act, Disclose disclose) {
+		AjaxJson j = new AjaxJson();
+		actTaskService.auditSave3(act,disclose);
+		j.setMsg("审批成功");
+		return j;
+	}
+
 
 	/**
 	 * 施工交底审批
@@ -389,9 +403,9 @@ public class ActTaskController extends BaseController {
 
 	@ResponseBody
 	@RequestMapping(value = "newAudit")
-	public AjaxJson newAuditTask(Act act, Construction construction) {
+	public AjaxJson newAuditTask(Act act,String tuser,Construction construction) {
 		AjaxJson j = new AjaxJson();
-		actTaskService.newAuditSave(act,construction);
+		actTaskService.newAuditSave(act,tuser,construction);
 		j.setMsg("审批成功");
 		return j;
 	}

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -51,6 +51,9 @@
                 #{item}
                 </foreach>
 			</if>
+			<if test="projectId != null and projectId != ''">
+				AND a.project_id LIKE CONCAT(CONCAT('%',#{projectId},'%'))
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DataMaintenanceService.java

@@ -103,13 +103,26 @@ public class DataMaintenanceService extends CrudService<DataMaintenanceMapper, M
 			e.printStackTrace();
 		} finally {
 		}
+        	}
 
 
-
-
-
-
-
-        	}
+	public void exportHeard( HttpServletResponse response){
+		Workbook workbook = null;
+		try {
+			workbook = ExcelWriter.exportHeard();
+			long time = System.currentTimeMillis();
+			String outFile = time + ".xlsx";
+			OutputStream outputStream = response.getOutputStream();
+			response.reset();
+			response.setHeader("Content-Disposition", "attachment;filename="+outFile);
+			response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+			workbook.write(outputStream);
+			outputStream.flush();
+			outputStream.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+		}
+	}
 	
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/util/ExcelWriter.java

@@ -9,6 +9,7 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  *
@@ -44,6 +45,26 @@ public class ExcelWriter {
         return workbook;
     }
 
+
+    public static Workbook exportHeard(){
+        // 生成xlsx的Excel
+        Workbook workbook = new SXSSFWorkbook();
+        // 生成Sheet表，写入第一行的列头
+        Sheet sheet = buildHerd(workbook);
+        List<MaintainData> dataList = new LinkedList<>();
+        int rowNum = 3;
+        for (Iterator<MaintainData> it = dataList.iterator(); it.hasNext(); ) {
+            MaintainData data = it.next();
+            if (data == null) {
+                continue;
+            }
+            //输出行数据
+            Row row = sheet.createRow(rowNum++);
+            convertDataToRow(data, row);
+        }
+        return workbook;
+    }
+
     /**
      * 生成sheet表，并写入第一行数据（列头）
      * @param workbook 工作簿对象
@@ -66,12 +87,13 @@ public class ExcelWriter {
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 6, 6));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 7, 7));
         sheet.addMergedRegion(new CellRangeAddress(2, 0, 8, 8));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 18));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 19));
         sheet.addMergedRegion(new CellRangeAddress(2, 1, 9, 9));
         sheet.addMergedRegion(new CellRangeAddress(2, 1, 10, 10));
         sheet.addMergedRegion(new CellRangeAddress(2, 1, 11, 11));
         sheet.addMergedRegion(new CellRangeAddress(2, 1, 12, 12));
         sheet.addMergedRegion(new CellRangeAddress(1, 1, 13, 18));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 19, 19));
         // 构建头单元格样式
         styles = createStyles(sheet.getWorkbook());
         CellStyle cellStyle = buildHeadCellStyle(sheet.getWorkbook());
@@ -205,6 +227,12 @@ public class ExcelWriter {
         Cell celll = row3.createCell(11);
         celll.setCellValue("");
         celll.setCellStyle(styles.get("header"));
+        Cell celll1 = row3.createCell(19);
+        celll1.setCellValue("");
+        celll1.setCellStyle(styles.get("header"));
+        Cell celll11 = row1.createCell(19);
+        celll11.setCellValue("");
+        celll11.setCellStyle(styles.get("header"));
 
         Cell cell9 = row2.createCell(12);
         cell9.setCellValue("主材费");
@@ -212,6 +240,9 @@ public class ExcelWriter {
         Cell cell10 = row2.createCell(13);
         cell10.setCellValue("其他费用");
         cell10.setCellStyle(styles.get("header"));
+        Cell cell101 = row2.createCell(19);
+        cell101.setCellValue("合计");
+        cell101.setCellStyle(styles.get("header"));
         Cell cell11 = row3.createCell(13);
         cell11.setCellValue("设计费");
         cell11.setCellStyle(styles.get("header"));
@@ -228,7 +259,7 @@ public class ExcelWriter {
         cell15.setCellValue("法人管理费（余物清理费）");
         cell15.setCellStyle(styles.get("header"));
         Cell cell16 = row3.createCell(18);
-        cell16.setCellValue("合计");
+        cell16.setCellValue("小计");
         cell16.setCellStyle(styles.get("header"));
         return sheet;
     }
@@ -462,11 +493,204 @@ public class ExcelWriter {
         }
         cell = row.createCell(cellNum++);
         cell.setCellStyle(styles.get("data"));
-        if (null != maintainData.getTotalFee()) {
-            cell.setCellValue(maintainData.getTotalFee());
-        } else {
-            cell.setCellValue("");
-        }
+        cell.setCellValue(maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                              +maintainData.getDamages()+maintainData.getManagementFee());
+
+        cell = row.createCell(cellNum++);
+        cell.setCellStyle(styles.get("data"));
+        cell.setCellValue(maintainData.getDesignFee()+maintainData.getSupervisionFee()+maintainData.getPreliminaryWorkFee()
+                    +maintainData.getDamages()+maintainData.getManagementFee()+maintainData.getBuildingFee()+maintainData.getInstallFee()
+                    +maintainData.getEquipmentFee()+maintainData.getMaterialFee());
+
+    }
+
+    private static Sheet buildHerd(Workbook workbook) {
+        CellStyle style = workbook.createCellStyle();
+        style.setBorderLeft(CellStyle.BORDER_THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Sheet sheet = workbook.createSheet();
+        // 设置列头宽度
+//        for (int i=0; i<CELL_HEADS.size(); i++) {
+//            sheet.setColumnWidth(i, 4000);
+//        }
+        // 设置默认行高
+        sheet.setDefaultRowHeight((short) 400);
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 0, 0));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 1, 1));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 2, 2));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 3, 3));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 4, 4));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 5, 5));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 6, 6));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 7, 7));
+        sheet.addMergedRegion(new CellRangeAddress(2, 0, 8, 8));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 17));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 9, 9));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 10, 10));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 11, 11));
+        sheet.addMergedRegion(new CellRangeAddress(2, 1, 12, 12));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 13, 17));
+        // 构建头单元格样式
+        styles = createStyles(sheet.getWorkbook());
+        CellStyle cellStyle = buildHeadCellStyle(sheet.getWorkbook());
+
+
+
+        // 写入第一行各列的数据
+        Row row1 = sheet.createRow(0);
+        Row row2 = sheet.createRow(1);
+        Row row3 = sheet.createRow(2);
+        Cell cell1 = row1.createCell(0);
+        cell1.setCellValue("项目定义编码");
+        cell1.setCellStyle(styles.get("header"));
+        Cell cella1 = row1.createCell(1);
+        cella1.setCellValue("设计单位");
+        cella1.setCellStyle(styles.get("header"));
+        Cell cellb1 = row1.createCell(2);
+        cellb1.setCellValue("施工单位");
+        cellb1.setCellStyle(styles.get("header"));
+        Cell cellc1 = row1.createCell(3);
+        cellc1.setCellValue("建筑地址");
+        cellc1.setCellStyle(styles.get("header"));
+        Cell celld1 = row1.createCell(4);
+        celld1.setCellValue("建筑属性");
+        celld1.setCellStyle(styles.get("header"));
+        Cell celle1 = row1.createCell(5);
+        celle1.setCellValue("发文总投资");
+        celle1.setCellStyle(styles.get("header"));
+        Cell cell2 = row1.createCell(6);
+        cell2.setCellValue("开工时间");
+        cell2.setCellStyle(styles.get("header"));
+        Cell cell3 = row1.createCell(7);
+        cell3.setCellValue("竣工时间");
+        cell3.setCellStyle(styles.get("header"));
+        Cell cell4 = row1.createCell(8);
+        cell4.setCellValue("批准文号");
+        cell4.setCellStyle(styles.get("header"));
+
+
+        Cell cella = row2.createCell(0);
+        cella.setCellValue("");
+        cella.setCellStyle(styles.get("header"));
+        Cell cella2 = row2.createCell(1);
+        cella2.setCellValue("");
+        cella2.setCellStyle(styles.get("header"));
+        Cell cella3 = row2.createCell(2);
+        cella3.setCellValue("");
+        cella3.setCellStyle(styles.get("header"));
+        Cell cella4 = row2.createCell(3);
+        cella4.setCellValue("");
+        cella4.setCellStyle(styles.get("header"));
+        Cell cella5 = row2.createCell(4);
+        cella5.setCellValue("");
+        cella5.setCellStyle(styles.get("header"));
+        Cell cella6 = row2.createCell(5);
+        cella6.setCellValue("");
+        cella6.setCellStyle(styles.get("header"));
+        Cell cellb = row2.createCell(6);
+        cellb.setCellValue("");
+        cellb.setCellStyle(styles.get("header"));
+        Cell cellc = row2.createCell(7);
+        cellc.setCellValue("");
+        cellc.setCellStyle(styles.get("header"));
+        Cell celld = row2.createCell(8);
+        celld.setCellValue("");
+        celld.setCellStyle(styles.get("header"));
+
+        Cell cellm = row2.createCell(14);
+        cellm.setCellValue("");
+        cellm.setCellStyle(styles.get("header"));
+        Cell celln = row2.createCell(15);
+        celln.setCellValue("");
+        celln.setCellStyle(styles.get("header"));
+        Cell cello = row2.createCell(16);
+        cello.setCellValue("");
+        cello.setCellStyle(styles.get("header"));
+        Cell cellp = row2.createCell(17);
+        cellp.setCellValue("");
+        cellp.setCellStyle(styles.get("header"));
+        Cell cellq = row1.createCell(17);
+        cellq.setCellValue("");
+        cellq.setCellStyle(styles.get("header"));
 
+        Cell celle = row3.createCell(0);
+        celle.setCellValue("");
+        celle.setCellStyle(styles.get("header"));
+        Cell celle6 = row3.createCell(1);
+        celle6.setCellValue("");
+        celle6.setCellStyle(styles.get("header"));
+        Cell celle2 = row3.createCell(2);
+        celle2.setCellValue("");
+        celle2.setCellStyle(styles.get("header"));
+        Cell celle3 = row3.createCell(3);
+        celle3.setCellValue("");
+        celle3.setCellStyle(styles.get("header"));
+        Cell celle4 = row3.createCell(4);
+        celle4.setCellValue("");
+        celle4.setCellStyle(styles.get("header"));
+        Cell celle5 = row3.createCell(5);
+        celle5.setCellValue("");
+        celle5.setCellStyle(styles.get("header"));
+        Cell cellf = row3.createCell(6);
+        cellf.setCellValue("");
+        cellf.setCellStyle(styles.get("header"));
+        Cell cellg = row3.createCell(7);
+        cellg.setCellValue("");
+        cellg.setCellStyle(styles.get("header"));
+        Cell cellh = row3.createCell(8);
+        cellh.setCellValue("");
+        cellh.setCellStyle(styles.get("header"));
+
+        Cell cell5 = row1.createCell(9);
+        cell5.setCellValue("概算数");
+        cell5.setCellStyle(styles.get("header"));
+        Cell cell6 = row2.createCell(9);
+        cell6.setCellValue("建筑费");
+        cell6.setCellStyle(styles.get("header"));
+        Cell cell7 = row2.createCell(10);
+        cell7.setCellValue("安装费");
+        cell7.setCellStyle(styles.get("header"));
+        Cell cell8 = row2.createCell(11);
+        cell8.setCellValue("设备购置费");
+        cell8.setCellStyle(styles.get("header"));
+
+        Cell cellj = row3.createCell(9);
+        cellj.setCellValue("");
+        cellj.setCellStyle(styles.get("header"));
+        Cell cellk = row3.createCell(10);
+        cellk.setCellValue("");
+        cellk.setCellStyle(styles.get("header"));
+        Cell celll = row3.createCell(11);
+        celll.setCellValue("");
+        celll.setCellStyle(styles.get("header"));
+        Cell celll1 = row3.createCell(12);
+        celll1.setCellValue("");
+        celll1.setCellStyle(styles.get("header"));
+
+
+        Cell cell9 = row2.createCell(12);
+        cell9.setCellValue("主材费");
+        cell9.setCellStyle(styles.get("header"));
+        Cell cell10 = row2.createCell(13);
+        cell10.setCellValue("其他费用");
+        cell10.setCellStyle(styles.get("header"));
+        Cell cell11 = row3.createCell(13);
+        cell11.setCellValue("设计费");
+        cell11.setCellStyle(styles.get("header"));
+        Cell cell12 = row3.createCell(14);
+        cell12.setCellValue("监理费");
+        cell12.setCellStyle(styles.get("header"));
+        Cell cell13 = row3.createCell(15);
+        cell13.setCellValue("项目前期工作费");
+        cell13.setCellStyle(styles.get("header"));
+        Cell cell14 = row3.createCell(16);
+        cell14.setCellValue("线路施工赔偿费");
+        cell14.setCellStyle(styles.get("header"));
+        Cell cell15 = row3.createCell(17);
+        cell15.setCellValue("法人管理费（余物清理费）");
+        cell15.setCellStyle(styles.get("header"));
+        return sheet;
     }
+
 }
+

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -89,7 +89,11 @@ public class DataMaintenanceController extends BaseController {
 		}
 		if(StringUtils.isNotBlank(st)){
 			String[] sts = st.split("\\s+");
-			maintainData.setProjectIds(sts);
+			if(sts.length == 1){
+			    maintainData.setProjectId(sts[0]);
+            }else {
+                maintainData.setProjectIds(sts);
+            }
 		}
 		Page<MaintainData> page = dataMaintenanceService.findPage(new Page<MaintainData>(request, response), maintainData);
 		return getBootstrapData(page);
@@ -241,10 +245,9 @@ public class DataMaintenanceController extends BaseController {
      public AjaxJson importFileTemplate(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
 		try {
-            String fileName = "维护数据导入模板.xlsx";
-    		List<MaintainData> list = Lists.newArrayList();
-    		new ExportExcel(null, MaintainData.class, 1).setDataList(list).write(response, fileName).dispose();
-    		return null;
+			dataMaintenanceService.exportHeard(response);
+			j.setSuccess(true);
+			j.setMsg("导出成功！");
 		} catch (Exception e) {
 			j.setSuccess(false);
 			j.setMsg( "导入模板下载失败！失败信息："+e.getMessage());
@@ -282,7 +285,6 @@ public class DataMaintenanceController extends BaseController {
 				maintainData.setPreliminaryWorkFee(getDouble(importExcel,row,15));
 				maintainData.setDamages(getDouble(importExcel,row,16));
 				maintainData.setManagementFee(getDouble(importExcel,row,17));
-				maintainData.setTotalFee(getDouble(importExcel,row,18));
 				list.add(maintainData);
 			}
 		}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -19,6 +19,26 @@ public class Construction extends ActEntity<Construction> {
     private String projectName;		// 项目名称
     private Date acceptDate;		// 接收图纸时间
     private String examineDate;		// 查看时间
+    private String powerLine;
+    private String blackoutArea;
+    private String projectType;
+    private String powerFailure;
+    private String preliminaryJudgment;
+    private String civilEngineering;
+    private String baseType;
+    private String planApproval;
+    private String transformationType;
+    private String transformationEquipment;
+    private String newNamed;
+    private String putInto;
+    private String electricalConstruction;
+    private String theAssignment;
+    private String automation;
+    private String remote;
+    private String communicationMode;
+    private String inSitu;
+    private String networkCabinet;
+    private String station;
 
     public User getTuser() {
         return tuser;
@@ -77,4 +97,164 @@ public class Construction extends ActEntity<Construction> {
     public void setExamineDate(String examineDate) {
         this.examineDate = examineDate;
     }
+
+    public String getPowerLine() {
+        return powerLine;
+    }
+
+    public void setPowerLine(String powerLine) {
+        this.powerLine = powerLine;
+    }
+
+    public String getBlackoutArea() {
+        return blackoutArea;
+    }
+
+    public void setBlackoutArea(String blackoutArea) {
+        this.blackoutArea = blackoutArea;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getPowerFailure() {
+        return powerFailure;
+    }
+
+    public void setPowerFailure(String powerFailure) {
+        this.powerFailure = powerFailure;
+    }
+
+    public String getPreliminaryJudgment() {
+        return preliminaryJudgment;
+    }
+
+    public void setPreliminaryJudgment(String preliminaryJudgment) {
+        this.preliminaryJudgment = preliminaryJudgment;
+    }
+
+    public String getCivilEngineering() {
+        return civilEngineering;
+    }
+
+    public void setCivilEngineering(String civilEngineering) {
+        this.civilEngineering = civilEngineering;
+    }
+
+    public String getBaseType() {
+        return baseType;
+    }
+
+    public void setBaseType(String baseType) {
+        this.baseType = baseType;
+    }
+
+    public String getPlanApproval() {
+        return planApproval;
+    }
+
+    public void setPlanApproval(String planApproval) {
+        this.planApproval = planApproval;
+    }
+
+    public String getTransformationType() {
+        return transformationType;
+    }
+
+    public void setTransformationType(String transformationType) {
+        this.transformationType = transformationType;
+    }
+
+    public String getTransformationEquipment() {
+        return transformationEquipment;
+    }
+
+    public void setTransformationEquipment(String transformationEquipment) {
+        this.transformationEquipment = transformationEquipment;
+    }
+
+    public String getNewNamed() {
+        return newNamed;
+    }
+
+    public void setNewNamed(String newNamed) {
+        this.newNamed = newNamed;
+    }
+
+    public String getPutInto() {
+        return putInto;
+    }
+
+    public void setPutInto(String putInto) {
+        this.putInto = putInto;
+    }
+
+    public String getElectricalConstruction() {
+        return electricalConstruction;
+    }
+
+    public void setElectricalConstruction(String electricalConstruction) {
+        this.electricalConstruction = electricalConstruction;
+    }
+
+    public String getTheAssignment() {
+        return theAssignment;
+    }
+
+    public void setTheAssignment(String theAssignment) {
+        this.theAssignment = theAssignment;
+    }
+
+    public String getAutomation() {
+        return automation;
+    }
+
+    public void setAutomation(String automation) {
+        this.automation = automation;
+    }
+
+    public String getRemote() {
+        return remote;
+    }
+
+    public void setRemote(String remote) {
+        this.remote = remote;
+    }
+
+    public String getCommunicationMode() {
+        return communicationMode;
+    }
+
+    public void setCommunicationMode(String communicationMode) {
+        this.communicationMode = communicationMode;
+    }
+
+    public String getInSitu() {
+        return inSitu;
+    }
+
+    public void setInSitu(String inSitu) {
+        this.inSitu = inSitu;
+    }
+
+    public String getNetworkCabinet() {
+        return networkCabinet;
+    }
+
+    public void setNetworkCabinet(String networkCabinet) {
+        this.networkCabinet = networkCabinet;
+    }
+
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Disclose.java

@@ -0,0 +1,196 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+public class Disclose  extends ActEntity<Disclose> {
+    private static final long serialVersionUID = 1L;
+    private String conId;
+    private String channel;
+    private String capacity;
+    private String sceneSize;
+    private String capacitySize;
+    private String hiddenDanger;
+    private String influenceConstruction;
+    private String projectRepetition;
+    private String implemented;
+    private String transformer;
+    private String lineName;
+    private String quantities;
+    private String rodNumber;
+    private String administrationType;
+    private String politicalProblem;
+    private String precondition;
+    private String placementMode;
+    private String productionDate;
+    private String IntegrateModule;
+    private String needReplace;
+    private String overallTransformation;
+
+    public String getConId() {
+        return conId;
+    }
+
+    public void setConId(String conId) {
+        this.conId = conId;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    public String getCapacity() {
+        return capacity;
+    }
+
+    public void setCapacity(String capacity) {
+        this.capacity = capacity;
+    }
+
+    public String getSceneSize() {
+        return sceneSize;
+    }
+
+    public void setSceneSize(String sceneSize) {
+        this.sceneSize = sceneSize;
+    }
+
+    public String getCapacitySize() {
+        return capacitySize;
+    }
+
+    public void setCapacitySize(String capacitySize) {
+        this.capacitySize = capacitySize;
+    }
+
+    public String getHiddenDanger() {
+        return hiddenDanger;
+    }
+
+    public void setHiddenDanger(String hiddenDanger) {
+        this.hiddenDanger = hiddenDanger;
+    }
+
+    public String getInfluenceConstruction() {
+        return influenceConstruction;
+    }
+
+    public void setInfluenceConstruction(String influenceConstruction) {
+        this.influenceConstruction = influenceConstruction;
+    }
+
+    public String getProjectRepetition() {
+        return projectRepetition;
+    }
+
+    public void setProjectRepetition(String projectRepetition) {
+        this.projectRepetition = projectRepetition;
+    }
+
+    public String getImplemented() {
+        return implemented;
+    }
+
+    public void setImplemented(String implemented) {
+        this.implemented = implemented;
+    }
+
+    public String getTransformer() {
+        return transformer;
+    }
+
+    public void setTransformer(String transformer) {
+        this.transformer = transformer;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getQuantities() {
+        return quantities;
+    }
+
+    public void setQuantities(String quantities) {
+        this.quantities = quantities;
+    }
+
+    public String getRodNumber() {
+        return rodNumber;
+    }
+
+    public void setRodNumber(String rodNumber) {
+        this.rodNumber = rodNumber;
+    }
+
+    public String getAdministrationType() {
+        return administrationType;
+    }
+
+    public void setAdministrationType(String administrationType) {
+        this.administrationType = administrationType;
+    }
+
+    public String getPoliticalProblem() {
+        return politicalProblem;
+    }
+
+    public void setPoliticalProblem(String politicalProblem) {
+        this.politicalProblem = politicalProblem;
+    }
+
+    public String getPrecondition() {
+        return precondition;
+    }
+
+    public void setPrecondition(String precondition) {
+        this.precondition = precondition;
+    }
+
+    public String getPlacementMode() {
+        return placementMode;
+    }
+
+    public void setPlacementMode(String placementMode) {
+        this.placementMode = placementMode;
+    }
+
+    public String getProductionDate() {
+        return productionDate;
+    }
+
+    public void setProductionDate(String productionDate) {
+        this.productionDate = productionDate;
+    }
+
+    public String getIntegrateModule() {
+        return IntegrateModule;
+    }
+
+    public void setIntegrateModule(String integrateModule) {
+        IntegrateModule = integrateModule;
+    }
+
+    public String getNeedReplace() {
+        return needReplace;
+    }
+
+    public void setNeedReplace(String needReplace) {
+        this.needReplace = needReplace;
+    }
+
+    public String getOverallTransformation() {
+        return overallTransformation;
+    }
+
+    public void setOverallTransformation(String overallTransformation) {
+        this.overallTransformation = overallTransformation;
+    }
+}

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

@@ -16,5 +16,6 @@ import com.jeeplus.modules.test.activiti.entity.OALeave;
 
 @MyBatisMapper
 public interface ConstructionMapper extends BaseMapper<Construction> {
-	
+
+    int newUpdate(Construction construction);
 }

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+
+/**
+ * 施工交底MAPPER接口
+ * @author
+ * @version 2019-11-08
+ */
+
+@MyBatisMapper
+public interface DiscloseMapper extends BaseMapper<Disclose> {
+
+}

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

@@ -15,7 +15,27 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag"
+		a.del_flag AS "delFlag",
+		powerLine,
+		blackoutArea,
+		projectType,
+		powerFailure,
+		preliminaryJudgment,
+		civilEngineering,
+		baseType,
+		planApproval,
+		transformationType,
+		transformationEquipment,
+		newNamed,
+		putInto,
+		electricalConstruction,
+		theAssignment,
+		automation,
+		remote,
+		communicationMode,
+		inSitu,
+		networkCabinet,
+		station
 	</sql>
 	
 	<sql id="constructionJoins">
@@ -117,7 +137,31 @@
 			remarks = #{remarks}
 		WHERE id = #{id}
 	</update>
-	
+
+	<update id="newUpdate">
+		UPDATE xm_construction_clarificaiton 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/mapper/xml/DiscloseMapper.xml

@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.DiscloseMapper">
+    
+	<sql id="constructionColumns">
+		a.id AS "id",
+		a.proc_ins_id AS "procInsId",
+		conId,
+		channel,
+		capacity,
+		sceneSize,
+		capacitySize,
+		hiddenDanger,
+		influenceConstruction,
+		projectRepetition,
+		implemented,
+		transformer,
+		lineName,
+		quantities,
+		rodNumber,
+		administrationType,
+		politicalProblem,
+		precondition,
+		placementMode,
+		productionDate,
+		IntegrateModule,
+		needReplace,
+		overallTransformation,
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+
+	</sql>
+	
+	<sql id="constructionJoins">
+		LEFT JOIN sys_user updateBy ON updateBy.id = a.update_by
+	</sql>
+	
+    <resultMap type="Disclose" id="ConstructionResult" autoMapping="true">
+    	<result column="reason" property="reason"   typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
+    </resultMap>
+
+	<select id="get" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_disclose_conclusion a
+		<include refid="constructionJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_disclose_conclusion a
+		<include refid="constructionJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultMap="ConstructionResult" >
+		SELECT 
+			<include refid="constructionColumns"/>
+		FROM xm_disclose_conclusion a
+		<include refid="constructionJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_disclose_conclusion(
+			id,
+			proc_ins_id,
+			conId,
+			channel,
+			capacity,
+			sceneSize,
+			capacitySize,
+			hiddenDanger,
+			influenceConstruction,
+			projectRepetition,
+			implemented,
+			transformer,
+			lineName,
+			quantities,
+			rodNumber,
+			administrationType,
+			politicalProblem,
+			precondition,
+			placementMode,
+			productionDate,
+			IntegrateModule,
+			needReplace,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{procInsId},
+			#{channel},
+			#{capacity},
+			#{conId},
+			#{sceneSize},
+			#{capacitySize},
+			#{hiddenDanger},
+			#{influenceConstruction},
+			#{projectRepetition},
+			#{implemented},
+			#{transformer},
+			#{lineName},
+			#{quantities},
+			#{rodNumber},
+			#{administrationType},
+			#{politicalProblem},
+			#{precondition},
+			#{placementMode},
+			#{productionDate},
+			#{IntegrateModule},
+			#{needReplace},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE xm_disclose_conclusion SET
+			proc_ins_id = #{procInsId},
+			conId=#{conId},
+			channel = #{channel},
+			capacity = #{capacity},
+			sceneSize = #{sceneSize},
+			capacitySize = #{capacitySize},
+			hiddenDanger = #{hiddenDanger},
+			influenceConstruction = #{influenceConstruction},
+			projectRepetition = #{projectRepetition},
+			implemented = #{implemented},
+			transformer = #{transformer},
+			lineName = #{lineName},
+			quantities = #{quantities},
+			rodNumber = #{rodNumber},
+			administrationType = #{administrationType},
+			politicalProblem = #{politicalProblem},
+			precondition = #{precondition},
+			placementMode = #{placementMode},
+			productionDate = #{productionDate},
+			IntegrateModule = #{IntegrateModule},
+			needReplace = #{needReplace},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</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">
+		DELETE FROM xm_disclose_conclusion
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_disclose_conclusion SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="OALeave" statementType="STATEMENT">
+		select * FROM xm_disclose_conclusion  where ${propertyName} = '${value}'
+	</select>
+	
+</mapper>

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

@@ -9,6 +9,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import com.jeeplus.modules.test.activiti.mapper.OALeaveMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,7 +24,8 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class ConstructionService extends CrudService<ConstructionMapper, Construction> {
 
-
+	@Autowired
+	private ConstructionMapper constructionMapper;
 
 	public Construction get(String id) {
 		return super.get(id);
@@ -47,6 +49,10 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		super.delete(construction);
 	}
 
+	public void newUpdate(Construction construction){
+		constructionMapper.newUpdate(construction);
+	}
+
 
 
 }

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

@@ -0,0 +1,54 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+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.mapper.ConstructionMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.DiscloseMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 施工交底Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class DiscloseService extends CrudService<DiscloseMapper,Disclose> {
+
+	@Autowired
+	private DiscloseMapper discloseMapper;
+
+	@Override
+	public Disclose get(Disclose entity) {
+		return super.get(entity);
+	}
+
+	@Override
+	public List<Disclose> findList(Disclose entity) {
+		return super.findList(entity);
+	}
+
+	@Override
+	public Page<Disclose> findPage(Page<Disclose> page, Disclose entity) {
+		return super.findPage(page, entity);
+	}
+
+	@Override
+	public void save(Disclose entity) {
+		super.save(entity);
+	}
+
+	@Override
+	public void delete(Disclose entity) {
+		super.delete(entity);
+	}
+}

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

@@ -11,7 +11,9 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 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.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -36,6 +38,8 @@ public class DivideController extends BaseController {
 	private ActProcessService actProcessService;
 	@Autowired
 	private ActTaskService actTaskService;
+	@Autowired
+	private DiscloseService discloseService;
 	
 	@ModelAttribute
 	public Construction get(@RequestParam(required=false) String id) {
@@ -58,7 +62,11 @@ public class DivideController extends BaseController {
 	@RequestMapping(value = "form/{mode}")
 	public String form(@PathVariable String mode, Construction construction, Model model) {
 		model.addAttribute("construction", construction);
-		return "modules/sg/managementcenter/activiti/divideAudit";
+		if("audit".equals(mode)){
+			return "modules/sg/managementcenter/activiti/divideAudit";
+		}else{//audit
+			return "modules/sg/managementcenter/activiti/divideForm";
+		}
 //		return "modules/sg/managementcenter/activiti/constructionForm";
 	}
 
@@ -67,12 +75,12 @@ public class DivideController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "save")
-	public AjaxJson save(Construction construction, Model model) throws Exception{
+	public AjaxJson save(Disclose disclose, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
 		/**
 		 * 后台hibernate-validation插件校验
 		 */
-		String errMsg = beanValidator(construction);
+		String errMsg = beanValidator(disclose);
 		if (StringUtils.isNotBlank(errMsg)){
 			j.setSuccess(false);
 			j.setMsg(errMsg);
@@ -83,23 +91,23 @@ public class DivideController extends BaseController {
 		/**
 		 * 流程审批
 		 */
-		if (StringUtils.isBlank(construction.getId())){
+		if (StringUtils.isBlank(disclose.getId())){
 			//新增或编辑表单保存
-			constructionService.save(construction);//保存
+			discloseService.save(disclose);//保存
 			// 启动流程
-			ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
-			String title = construction.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
-			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", construction.getId(), title);
+			ProcessDefinition p = actProcessService.getProcessDefinition(disclose.getAct().getProcDefId());
+			String title = disclose.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
+			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", disclose.getId(), title);
 			j.setMsg("发起流程审批成功!");
 			j.getBody().put("targetUrl",  "/act/task/process/");
 		}else{
 			//新增或编辑表单保存
-			constructionService.save(construction);//保存
-			construction.getAct().setComment(("yes".equals(construction.getAct().getFlag())?"[重新申请] ":"[销毁申请] "));
+			discloseService.save(disclose);//保存
+			disclose.getAct().setComment(("yes".equals(disclose.getAct().getFlag())?"[重新申请] ":"[销毁申请] "));
 			// 完成流程任务
 			Map<String, Object> vars = Maps.newHashMap();
-			vars.put("reapply", "yes".equals(construction.getAct().getFlag())? true : false);
-			actTaskService.complete(construction.getAct().getTaskId(), construction.getAct().getProcInsId(), construction.getAct().getComment(), construction.getContent(), vars);
+			vars.put("reapply", "yes".equals(disclose.getAct().getFlag())? true : false);
+			actTaskService.complete(disclose.getAct().getTaskId(), disclose.getAct().getProcInsId(), disclose.getAct().getComment(), disclose.getContent(), vars);
 			j.setMsg("提交成功！");
 			j.getBody().put("targetUrl",  "/act/task/todo/");
 		}

src/main/webapp/webpage/modules/common/userSelect.jsp

@@ -176,10 +176,10 @@
 	
 	<div class="wrapper wrapper-content">
 	<div class="row">
-		<div class="col-sm-3 col-md-2" >
+		<div class="col-sm-3 col-md-2" style="width: 30%" >
 			<div id="jstree"></div>
 		</div>
-		<div  class="col-sm-9 col-md-10 animated fadeInRight">
+		<div  class="col-sm-9 col-md-10 animated fadeInRight" style="width: 70%">
 			<!-- 搜索框-->
 		<div class="accordion-group">
 			<div id="collapseTwo" class="accordion-body">

src/main/webapp/webpage/modules/sg/financial/settlement/dataMaintenanceList.js

@@ -175,10 +175,10 @@ $(document).ready(function() {
 					   field: 'managementFee',
 					   title: '法人管理费'
                }
-             ,{
-					   field: 'totalFee',
-					   title: '合计'
-               }
+             // ,{
+				// 	   field: 'totalFee',
+				// 	   title: '合计'
+             //   }
 		     ]
 		
 		});
@@ -256,6 +256,10 @@ $(document).ready(function() {
 			jp.downloadFile('${ctx}/sg/settlement/export');
 	  });
 
+    $("#export1").click(function(){//导出Excel文件
+        jp.downloadFile('${ctx}/sg/settlement/import/template');
+     });
+
 		    
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#dataTable').bootstrapTable('refresh');

src/main/webapp/webpage/modules/sg/financial/settlement/dataMaintenanceList.jsp

@@ -43,16 +43,26 @@
 					<i class="glyphicon glyphicon-plus"></i> 新建
 				</button>
 			</shiro:hasPermission>
+		<shiro:hasPermission name="sg:settlement:del">
+			<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+				<i class="glyphicon glyphicon-remove"></i> 删除
+			</button>
+		</shiro:hasPermission>
 			<shiro:hasPermission name="sg:settlement:edit">
 			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
 	            	<i class="glyphicon glyphicon-edit"></i> 修改
 	        	</button>
 			</shiro:hasPermission>
-			<shiro:hasPermission name="sg:settlement:del">
-				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
-	            	<i class="glyphicon glyphicon-remove"></i> 删除
-	        	</button>
-			</shiro:hasPermission>
+		<shiro:hasPermission name="sg:settlement:view">
+			<button id="view" class="btn btn-default" disabled onclick="view()">
+				<i class="fa fa-search-plus"></i> 查看
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:settlement:export">
+			<button id="export1" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出模板
+			</button>
+		</shiro:hasPermission>
 			<shiro:hasPermission name="sg:settlement:import">
 				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
 			</shiro:hasPermission>
@@ -61,11 +71,7 @@
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 			 </shiro:hasPermission>
-	                 <shiro:hasPermission name="sg:settlement:view">
-				<button id="view" class="btn btn-default" disabled onclick="view()">
-					<i class="fa fa-search-plus"></i> 查看
-				</button>
-			</shiro:hasPermission>
+
 		    <shiro:hasPermission name="sg:settlement:import">
 					<button id="btnSearch" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入查询
 			    </button>

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

@@ -21,7 +21,36 @@
 
 
 			$("#agree").click(function () {
-				jp.prompt("同意, 审批意见", function (message) {
+				// var ii=document.getElementById("tuser").value;
+				var tuser = $("#tuserName").val();
+				console.log(tuser);
+				if (tuser=="") {
+					jp.error("请选择用户");
+					return;
+				}
+				var id = $("#id").val();
+				var powerLine=$("#powerLine").val();
+				var blackoutArea=$("#blackoutArea").val();
+				var projectType=$("#projectType").val();
+				var powerFailure=$("#powerFailure").val();
+				var preliminaryJudgment=$("#preliminaryJudgment").val();
+				var civilEngineering=$("#civilEngineering").val();
+				var baseType=$("#baseType").val();
+				var planApproval=$("#planApproval").val();
+				var transformationType=$("#transformationType").val();
+				var transformationEquipment=$("#transformationEquipment").val();
+				var newNamed=$("#newNamed").val();
+				var putInto=$("#putInto").val();
+				var electricalConstruction=$("#electricalConstruction").val();
+				var theAssignment=$("#theAssignment").val();
+				var automation=$("#automation").val();
+				var remote=$("#remote").val();
+				var communicationMode=$("#communicationMode").val();
+				var inSitu=$("#inSitu").val();
+				var networkCabinet=$("#networkCabinet").val();
+				var station=$("#station").val();
+
+				jp.prompt("施工交底, 审批意见", function (message) {
 					jp.post("${ctx}/act/task/newAudit",
 							{
 								"taskId":"${construction.act.taskId}",
@@ -30,8 +59,29 @@
 								"procInsId":"${construction.act.procInsId}",
 								"procDefId":"${construction.act.procDefId}",
 								"flag":"manager",
-								"comment":message
-
+								"comment":message,
+								"tuser": tuser,
+								"id":id,
+								"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
 							},
 							function (data) {
 								if(data.success){
@@ -39,11 +89,34 @@
 									jp.go("${ctx}/act/task/todo")
 								}
 							})
-				})
+				});
 			})
 
 			$("#agree2").click(function () {
-				jp.prompt("同意, 审批意见", function (message) {
+				// var ii=document.getElementById("tuser").value;
+				var id = $("#id").val();
+				var powerLine=$("#powerLine").val();
+				var blackoutArea=$("#blackoutArea").val();
+				var projectType=$("#projectType").val();
+				var powerFailure=$("#powerFailure").val();
+				var preliminaryJudgment=$("#preliminaryJudgment").val();
+				var civilEngineering=$("#civilEngineering").val();
+				var baseType=$("#baseType").val();
+				var planApproval=$("#planApproval").val();
+				var transformationType=$("#transformationType").val();
+				var transformationEquipment=$("#transformationEquipment").val();
+				var newNamed=$("#newNamed").val();
+				var putInto=$("#putInto").val();
+				var electricalConstruction=$("#electricalConstruction").val();
+				var theAssignment=$("#theAssignment").val();
+				var automation=$("#automation").val();
+				var remote=$("#remote").val();
+				var communicationMode=$("#communicationMode").val();
+				var inSitu=$("#inSitu").val();
+				var networkCabinet=$("#networkCabinet").val();
+				var station=$("#station").val();
+
+				jp.prompt("经理交底, 审批意见", function (message) {
 					jp.post("${ctx}/act/task/newAudit",
 							{
 								"taskId":"${construction.act.taskId}",
@@ -52,8 +125,28 @@
 								"procInsId":"${construction.act.procInsId}",
 								"procDefId":"${construction.act.procDefId}",
 								"flag":"company",
-								"comment":message
-
+								"comment":message,
+								"id":id,
+								"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
 							},
 							function (data) {
 								if(data.success){
@@ -61,9 +154,10 @@
 									jp.go("${ctx}/act/task/todo")
 								}
 							})
-				})
+				});
 			})
 
+
 			$("#reject").click(function () {
 				jp.prompt("驳回, 审批意见", function (message) {
 					jp.post("${ctx}/act/task/newAudit",
@@ -121,51 +215,198 @@
 						<%--<h3>${oALeave.act.taskName}</h3>--%>
 					</div>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/activiti/save" method="post" class="form-horizontal">
-						<form:hidden path="id"/>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.userName)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>归属用户：</label>
-							<div class="col-sm-10">
-								<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-												cssClass="form-control required"/>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.projectId)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.projectName)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
-							<div class="col-sm-10">
-								<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>备注说明：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.examineDate)}
-<%--								<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>--%>
-							</div>
-						</div>
-						<hr>
+						<form:hidden id="id" path="id"/>
+						<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 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">
+										${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">
+									<input type='text' id="powerLine"  name="powerLine" class="form-control required"  value="${construction.powerLine}"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-35">
+									<input type='text'  id='blackoutArea'  name="blackoutArea" class="form-control required"  value="${construction.blackoutArea}"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+									<form:select id="projectType" path="projectType" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="配变改造">配变改造</form:option>
+										<form:option value="配变新增">配变新增</form:option>
+										<form:option value="电缆项目">电缆项目</form:option>
+										<form:option value="杆线项目">杆线项目</form:option>
+										<form:option value="混合项目">混合项目</form:option>
+										<form:option value="纯自动化">纯自动化</form:option>
+										<form:option value="纯土建">纯土建</form:option>
+										<form:option value="井盖维修">井盖维修</form:option>
+										<form:option value="环网柜更换">环网柜更换</form:option>
+										<form:option value="箱变更换">箱变更换</form:option>
+										<form:option value="其他特殊类">其他特殊类</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-35">
+									<form:select id="preliminaryJudgment" path="preliminaryJudgment" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="行政政处">行政政处</form:option>
+										<form:option value="民事政处">民事政处</form:option>
+										<form:option value="农村政处">农村政处</form:option>
+										<form:option value="无">无</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+								<td class="width-35">
+									<form:select id="civilEngineering" path="civilEngineering" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="可能有土建">可能有土建</form:option>
+										<form:option value="无土建">无土建</form:option>
+										<form:option value="含土建">含土建</form:option>
+										<form:option value="纯土建">纯土建</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-35">
+									<form:select id="baseType" path="baseType" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="无">无</form:option>
+										<form:option value="压桩">压桩</form:option>
+										<form:option value="灌注桩">灌注桩</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-35">
+									<form:select id="planApproval" path="planApproval" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-35">
+									<form:select id="transformationType" path="transformationType" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="无">无</form:option>
+										<form:option value="环网柜">环网柜</form:option>
+										<form:option value="箱变">箱变</form:option>
+										<form:option value="干变">干变</form:option>
+										<form:option value="其他">其他</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+								<td class="width-35">
+									<input type='text' id='transformationEquipment'  name="transformationEquipment" class="form-control required"  value="${construction.transformationEquipment}"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-35">
+									<form:select id="newNamed" path="newNamed" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+									<form:select id="putInto" path="putInto" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-35">
+									<form:select id="electricalConstruction" path="electricalConstruction" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+								<td class="width-35">
+									<form:select id="theAssignment" path="theAssignment" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="带电作业">带电作业</form:option>
+										<form:option value="停电作业">停电作业</form:option>
+										<form:option value="非涉电作业">非涉电作业</form:option>
+										<form:option value="未标注">未标注</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-35">
+									<form:select id="automation" path="automation" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+								<td class="width-35">
+									<form:select id="remote" path="remote" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="二遥">二遥</form:option>
+										<form:option value="三遥">三遥</form:option>
+									</form:select>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-35">
+									<form:select id="communicationMode" path="communicationMode" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="光纤">光纤</form:option>
+										<form:option value="公网">公网</form:option>
+										<form:option value="专网">专网</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+								<td class="width-35">
+									<div>
+										<form:select id="inSitu" path="inSitu" htmlEscape="false" maxlength="100"  class=" form-control">
+											<form:option value="集中">集中</form:option>
+											<form:option value="就地">就地</form:option>
+										</form:select>
+									</div>								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-35">
+									<form:select id="networkCabinet" path="networkCabinet" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="户外">户外</form:option>
+										<form:option value="户内">户内</form:option>
+									</form:select>								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-35">
+									<input type='text'  id='station' name="station" class="form-control required"  value="${construction.station}"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-35">
+									<form:select id="powerFailure" path="powerFailure" htmlEscape="false" maxlength="100"  class=" form-control">
+										<form:option value="是">是</form:option>
+										<form:option value="否">否</form:option>
+									</form:select>								</td>
+							</tr>
+							</tbody>
+						</table>
 					</form:form>
 
 
@@ -174,8 +415,8 @@
 							<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;
-									<input id="agree2" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="项目经理" />
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="施工单位技术交底" />&nbsp;
+									<input id="agree2" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="项目经理技术交底" />
 									<input id="reject" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳 回" />&nbsp;
 								</div>
 							</div>

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

@@ -19,6 +19,15 @@
 				}
 			});
 
+			$("#agree").click(function () {
+				var tuser = $("#tuserName").val();
+				console.log(tuser);
+				if (tuser=="") {
+					jp.error("请选择用户");
+					return;
+				}
+			})
+
 			$('#acceptDate').datetimepicker({
 				format: "YYYY-MM-DD HH:mm:ss"
 			});
@@ -60,69 +69,44 @@
 						<div class="form-group text-center">
 							<h3> 施工交底申请</h3>
 						</div>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
-							<div class="col-sm-10">
-								<div id='userName'>
+						<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">
 									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
-								</div>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>归属用户：</label>
-							<div class="col-sm-10">
-								<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-												cssClass="form-control required"/>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
-							<div class="col-sm-10">
-								<div id='projectId'>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属用户：</label></td>
+								<td class="width-35">
+									<sys:userselect 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='text'  name="projectId" class="form-control required"  value="${construction.projectId}"/>
-								</div>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
-							<div class="col-sm-10">
-								<div  id='projectName'>
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
 									<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>
-								</div>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
-							<div class="col-sm-10">
-									<div class='input-group form_datetime' id='acceptDate'>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">
 									<input type='text'  name="acceptDate" class="form-control required"  value="<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-									<span class="input-group-addon">
-								<span class="glyphicon glyphicon-calendar"></span>
-							</span>
-								</div>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>备注说明：</label>
-							<div class="col-sm-10">
-<%--								<div class='input-group form_datetime' id='examineDate'>
-									<input type='text'  name="examineDate" class="form-control required"  value="<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-									<span class="input-group-addon">
-										<span class="glyphicon glyphicon-calendar"></span>
-									</span>
-
-								</div>--%>
-								<div  id='examineDate'>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>备注说明：</label></td>
+								<td class="width-35">
 									<textarea  name="examineDate" style="height: 100px" class="form-control required">${construction.examineDate}</textarea>
-								</div>
-							</div>
-						</div>
-						<hr>
+								</td>
+							</tr>
+							</tbody>
+						</table>
+
+
+
 						<div class="form-group">
 							<div class="col-lg-3"></div>
 							<c:if test="${construction.act.taskDefKey ne '' && !construction.act.finishTask && construction.act.isNextGatewaty}">

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>请假申请管理</title>
+	<title>施工单位交底页面</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
@@ -101,42 +101,141 @@
 					</div>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.userName)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.projectId)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.projectName)}
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
-							<div class="col-sm-10">
-								<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-							</div>
-						</div>
-						<hr>
-						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>备注说明：</label>
-							<div class="col-sm-10">
-									${fns:unescapeHtml(construction.examineDate)}
-<%--								<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>--%>
-							</div>
-						</div>
-						<hr>
+						<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 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">
+										${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>
+							</tbody>
+						</table>
 					</form:form>
 
 
@@ -166,7 +265,6 @@
 						<act:flowChart procInsId="${construction.act.procInsId}"/>
 						<act:histoicFlow procInsId="${construction.act.procInsId}" />
 					</c:if>
-
 				</div>
 			</div>
 		</div>

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

@@ -0,0 +1,440 @@
+<%@ 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" %>
+	<script type="text/javascript">
+
+		$(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 () {
+				var conId = $("#id").val();
+				var channel = $("#channel").val();
+				var capacity = $("#capacity").val();
+				var sceneSize = $("#sceneSize").val();
+				var capacitySize = $("#capacitySize").val();
+				var hiddenDanger = $("#hiddenDanger").val();
+				var influenceConstruction = $("#influenceConstruction").val();
+				var projectRepetition = $("#projectRepetition").val();
+				var implemented = $("#implemented").val();
+				var transformer = $("#transformer").val();
+				var lineName = $("#lineName").val();
+				var quantities = $("#quantities").val();
+				var rodNumber = $("#rodNumber").val();
+				var administrationType = $("#administrationType").val();
+				var politicalProblem = $("#politicalProblem").val();
+				var precondition = $("#precondition").val();
+				var placementMode = $("#placementMode").val();
+				var productionDate = $("#productionDate").val();
+				var IntegrateModule = $("#IntegrateModule").val();
+				var needReplace = $("#needReplace").val();
+				var overallTransformation = $("#overallTransformation").val();
+				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":message,
+								"conId":conId,
+								"channel":channel,
+								"capacity":capacity,
+								"sceneSize":sceneSize,
+								"capacitySize":capacitySize,
+								"hiddenDanger":hiddenDanger,
+								"influenceConstruction":influenceConstruction,
+								"projectRepetition":projectRepetition,
+								"implemented":implemented,
+								"transformer":transformer,
+								"lineName":lineName,
+								"quantities":quantities,
+								"rodNumber":rodNumber,
+								"administrationType":administrationType,
+								"politicalProblem":politicalProblem,
+								"precondition":precondition,
+								"placementMode":placementMode,
+								"productionDate":productionDate,
+								"IntegrateModule":IntegrateModule,
+								"needReplace":needReplace,
+								"overallTransformation":overallTransformation
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			})
+
+
+			$("#reject").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":"no",
+								"comment":message
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}
+							})
+				})
+			})
+
+
+			$('#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'));//取富文本的值
+					}
+				}
+			});
+		});
+	</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">
+					<div class="form-group text-center">
+						<%--<h3>${oALeave.act.taskName}</h3>--%>
+					</div>
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
+					<form:hidden path="id"/>
+						${fns:unescapeHtml(construction.id)}
+
+						<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 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">
+										${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">
+									<input type='text' id='channel'  name="channel" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-35">
+									<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">
+									<input type='text' id='sceneSize'  name="sceneSize" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-35">
+									<input type='text' id='capacitySize'  name="capacitySize" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
+								<td class="width-35">
+									<input type='text' id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-35">
+									<input type='text' id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
+								<td class="width-35">
+									<input type='text' id='projectRepetition'  name="projectRepetition" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-35">
+									<input type='text' id='implemented'  name="implemented" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
+								<td class="width-35">
+									<input type='text' id='transformer'  name="transformer" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+									<input type='text' id='lineName'  name="lineName" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
+								<td class="width-35">
+									<input type='text' id='quantities'  name="quantities" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-35">
+									<input type='text' id='rodNumber'  name="rodNumber" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+								<td class="width-35">
+									<input type='text' id='administrationType'  name="administrationType" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-35">
+									<input type='text' id='politicalProblem'  name="politicalProblem" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-35">
+									<input type='text' id='precondition'  name="precondition" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-35">
+									<input type='text' id='placementMode'  name="placementMode" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
+								<td class="width-35">
+									<input type='text' id='productionDate'  name="productionDate" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-35">
+									<input type='text' id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+								<td class="width-35">
+									<input type='text' id='needReplace'  name="needReplace" class="form-control required"  value=""/>
+
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-35">
+									<input type='text' id='overallTransformation'  name="overallTransformation" class="form-control required"  value=""/>
+
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+
+
+
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
+						<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;
+									<input id="reject" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="存在问题" />
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && !construction.act.isNextGatewaty}">
+						<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>
+
+					<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>