erp导出类调整合并

必要性问题说明、图纸现场不一致说明和政策处理说明中“说明”改为“描述”
政策类型不为4.无时，必须填写政策处理说明
发起施工技术交底时可查询筛选工程编号、项目名称、项目定义
交底结论需增加一列，“其他问题描述”，处理方式和前置条件、施工通道一致

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

@@ -60,6 +60,8 @@ public class Disclose  extends ActEntity<Disclose> {
     private String overallTransformation;
     //记录taskId
     private String taskId;
+    //其它问题描述
+    private String otherProblem;
 
     public String getTaskId() {
         return taskId;
@@ -286,6 +288,14 @@ public class Disclose  extends ActEntity<Disclose> {
         this.overallTransformation = overallTransformation;
     }
 
+    public String getOtherProblem() {
+        return otherProblem;
+    }
+
+    public void setOtherProblem(String otherProblem) {
+        this.otherProblem = otherProblem;
+    }
+
     @Override
     public String toString() {
         return "Disclose{" +

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

@@ -42,8 +42,8 @@
 		d.overallTransformation AS "disclose.overallTransformation",
 		d.explanationOfNecessity AS "disclose.explanationOfNecessity",
 		d.inconsistentDescription AS "disclose.inconsistentDescription",
-		d.policyHandlingInstructions AS "disclose.policyHandlingInstructions"
-
+		d.policyHandlingInstructions AS "disclose.policyHandlingInstructions",
+		d.otherProblem AS "disclose.otherProblem"
 	</sql>
 
 
@@ -319,7 +319,8 @@
 		overallTransformation,
 		explanationOfNecessity,
 		inconsistentDescription,
-		policyHandlingInstructions
+		policyHandlingInstructions,
+		otherProblem
 		) values (
 		#{id},
 		#{createBy.id},
@@ -351,7 +352,8 @@
 		#{disclose.overallTransformation},
 		#{disclose.explanationOfNecessity},
 		#{disclose.inconsistentDescription},
-		#{disclose.policyHandlingInstructions}
+		#{disclose.policyHandlingInstructions},
+		#{disclose.otherProblem}
 		);
 	</insert>
 </mapper>

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

@@ -1,8 +1,8 @@
 <?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">
+
+    <sql id="constructionColumns">
 		a.id AS "id",
 		a.proc_ins_id AS "procInsId",
 		conId,
@@ -19,13 +19,13 @@
 		quantities,
 		rodNumber,
 		administrationType,
-		politicalProblem,
 		precondition,
 		placementMode,
 		productionDate,
 		IntegrateModule,
 		needReplace,
 		overallTransformation,
+		otherProblem,
 		explanationOfNecessity AS "explanationOfNecessity",
 		inconsistentDescription AS "inconsistentDescription",
 		policyHandlingInstructions AS "policyHandlingInstructions",
@@ -37,62 +37,62 @@
 		a.del_flag AS "delFlag"
 
 	</sql>
-	
-	<sql id="constructionJoins">
+
+    <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"/>
+        <result column="reason" property="reason" typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
     </resultMap>
 
-	<select id="get" resultMap="ConstructionResult" >
-		SELECT 
-			*
-		FROM xm_disclose_conclusion a
-		<include refid="constructionJoins"/>
-		WHERE a.proc_ins_id = #{procInsId}
-	</select>
-	
-	<select id="findList" resultMap="ConstructionResult" >
-		SELECT
-			*
-		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
-			*
-		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">
+    <select id="get" resultMap="ConstructionResult">
+        SELECT
+        *
+        FROM xm_disclose_conclusion a
+        <include refid="constructionJoins"/>
+        WHERE a.proc_ins_id = #{procInsId}
+    </select>
+
+    <select id="findList" resultMap="ConstructionResult">
+        SELECT
+        *
+        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
+        *
+        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,
@@ -110,7 +110,6 @@
 			quantities,
 			rodNumber,
 			administrationType,
-			politicalProblem,
 			precondition,
 			placementMode,
 			productionDate,
@@ -143,7 +142,6 @@
 			#{quantities},
 			#{rodNumber},
 			#{administrationType},
-			#{politicalProblem},
 			#{precondition},
 			#{placementMode},
 			#{productionDate},
@@ -161,8 +159,8 @@
 			#{delFlag}
 		)
 	</insert>
-	
-	<update id="update">
+
+    <update id="update">
 		UPDATE xm_disclose_conclusion SET
 			proc_ins_id = #{procInsId},
 			conId=#{conId},
@@ -179,7 +177,6 @@
 			quantities = #{quantities},
 			rodNumber = #{rodNumber},
 			administrationType = #{administrationType},
-			politicalProblem = #{politicalProblem},
 			precondition = #{precondition},
 			placementMode = #{placementMode},
 			productionDate = #{productionDate},
@@ -194,7 +191,7 @@
 			remarks = #{remarks}
 		WHERE proc_ins_id = #{procInsId}
 	</update>
-	<update id="updateById">
+    <update id="updateById">
 		UPDATE xm_disclose_conclusion SET
 			proc_ins_id = #{procInsId},
 			conId = #{conId},
@@ -225,131 +222,111 @@
 			overallTransformation = #{overallTransformation},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks}
-		WHERE proc_ins_id = #{procInsId}
+			remarks = #{remarks},
+			otherProblem=#{otherProblem}
+		WHERE proc_ins_id = #{procInsId};
 	</update>
-	<!--<update id="newUpdate">-->
-		<!--UPDATE xm_disclose_conclusion SET-->
-			<!--powerLine = #{powerLine},-->
-			<!--blackoutArea = #{blackoutArea},-->
-			<!--projectType = #{projectType},-->
-			<!--powerFailure = #{powerFailure},-->
-			<!--preliminaryJudgment = #{preliminaryJudgment},-->
-			<!--civilEngineering = #{civilEngineering},-->
-			<!--baseType = #{baseType},-->
-			<!--planApproval = #{planApproval},-->
-			<!--transformationType = #{transformationType},-->
-			<!--transformationEquipment = #{transformationEquipment},-->
-			<!--newNamed = #{newNamed},-->
-			<!--putInto = #{putInto},-->
-			<!--electricalConstruction = #{electricalConstruction},-->
-			<!--theAssignment = #{theAssignment},-->
-			<!--automation = #{automation},-->
-			<!--remote = #{remote},-->
-			<!--communicationMode = #{communicationMode},-->
-			<!--inSitu = #{inSitu},-->
-			<!--networkCabinet = #{networkCabinet},-->
-			<!--station = #{station}-->
-		<!--WHERE id = #{id}-->
-	<!--</update>-->
-	
-	<!--物理删除-->
-	<update id="delete">
+
+
+    <!--物理删除-->
+    <update id="delete">
 		DELETE FROM xm_disclose_conclusion
 		WHERE id = #{id}
 	</update>
-	
-	<!--逻辑删除-->
-	<update id="deleteByLogic">
+
+    <!--逻辑删除-->
+    <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 id="findUniqueByProperty" resultType="OALeave" statementType="STATEMENT">
 		select * FROM xm_disclose_conclusion  where ${propertyName} = '${value}'
 	</select>
 
 
-	<insert id="newInsert" parameterType="java.util.List">
-		replace into xm_disclose_conclusion(
-			id,
-			proc_ins_id,
-			conId,
-			requireName,
-			projectNumber,
-			projectName,
-			projectId,
-			channel,
-			capacity,
-			sceneSize,
-			capacitySize,
-			hiddenDanger,
-			influenceConstruction,
-			projectRepetition,
-			implemented,
-			transformer,
-			explanationOfNecessity,
-			lineName,
-			quantities,
-			rodNumber,
-			inconsistentDescription,
-			administrationType,
-			precondition,
-			policyHandlingInstructions,
-			placementMode,
-			productionDate,
-			IntegrateModule,
-			needReplace,
-			overallTransformation,
-			create_by,
-			create_date,
-			update_by,
-			update_date,
-			remarks,
-			del_flag
-		) VALUES
-		<foreach collection="disclose" item="item" index="index" separator="," >
-		(
-			#{item.id},
-			#{item.procInsId},
-			#{item.conId},
-			#{item.requireName},
-			#{item.projectNumber},
-			#{item.projectName},
-			#{item.projectId},
-			#{item.channel},
-			#{item.capacity},
-			#{item.sceneSize},
-			#{item.capacitySize},
-			#{item.hiddenDanger},
-			#{item.influenceConstruction},
-			#{item.projectRepetition},
-			#{item.implemented},
-			#{item.transformer},
-			#{item.explanationOfNecessity},
-			#{item.lineName},
-			#{item.quantities},
-			#{item.rodNumber},
-			#{item.inconsistentDescription},
-			#{item.administrationType},
-			#{item.precondition},
-			#{item.policyHandlingInstructions},
-			#{item.placementMode},
-			#{item.productionDate},
-			#{item.IntegrateModule},
-			#{item.needReplace},
-			#{item.overallTransformation},
-			#{item.createBy.id},
-			#{item.createDate},
-			#{item.updateBy.id},
-			#{item.updateDate},
-			#{item.remarks},
-			#{item.delFlag}
-		)
-		</foreach>
+    <insert id="newInsert" parameterType="java.util.List">
+        replace into xm_disclose_conclusion(
+        id,
+        proc_ins_id,
+        conId,
+        requireName,
+        projectNumber,
+        projectName,
+        projectId,
+        channel,
+        capacity,
+        sceneSize,
+        capacitySize,
+        hiddenDanger,
+        influenceConstruction,
+        projectRepetition,
+        implemented,
+        transformer,
+        explanationOfNecessity,
+        lineName,
+        quantities,
+        rodNumber,
+        inconsistentDescription,
+        administrationType,
+        precondition,
+        policyHandlingInstructions,
+        placementMode,
+        productionDate,
+        IntegrateModule,
+        needReplace,
+        overallTransformation,
+		otherProblem,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        remarks,
+        del_flag
+        ) VALUES
+        <foreach collection="disclose" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.procInsId},
+            #{item.conId},
+            #{item.requireName},
+            #{item.projectNumber},
+            #{item.projectName},
+            #{item.projectId},
+            #{item.channel},
+            #{item.capacity},
+            #{item.sceneSize},
+            #{item.capacitySize},
+            #{item.hiddenDanger},
+            #{item.influenceConstruction},
+            #{item.projectRepetition},
+            #{item.implemented},
+            #{item.transformer},
+            #{item.explanationOfNecessity},
+            #{item.lineName},
+            #{item.quantities},
+            #{item.rodNumber},
+            #{item.inconsistentDescription},
+            #{item.administrationType},
+            #{item.precondition},
+            #{item.policyHandlingInstructions},
+            #{item.placementMode},
+            #{item.productionDate},
+            #{item.IntegrateModule},
+            #{item.needReplace},
+            #{item.overallTransformation},
+            #{item.otherProblem},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            #{item.remarks},
+            #{item.delFlag}
+            )
+        </foreach>
 
-	</insert>
+    </insert>
 </mapper>

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

@@ -158,6 +158,10 @@ public class MyImportUtils {
                         }
                     }
                 }
+                if ("".equals(disclose.getPlacementMode())||disclose.getPlacementMode() == null||(!"户外".equals(disclose.getPlacementMode())&&!"户内".equals(disclose.getPlacementMode())&&!"无".equals(disclose.getPlacementMode()))){
+                    flag = true;
+                    tips+="DTU安放方式核查填写有误";
+                }
                 if ("".equals(integrateModule) || integrateModule == null||(!"是".equals(integrateModule)&&!"否".equals(integrateModule))) {
                     flag = true;
                     tips += "二次是否是集成模块填写有误";
@@ -211,7 +215,9 @@ public class MyImportUtils {
     public static void getTheEcho(Construction construction, Model model){
         //前置条件
         if ((null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition()))
-                ||(null!=construction.getDisclose().getChannel()&&!"".equals(construction.getDisclose().getChannel())&&!"无".equals(construction.getDisclose().getChannel()))){
+                ||(null!=construction.getDisclose().getChannel()&&!"".equals(construction.getDisclose().getChannel())&&!"无".equals(construction.getDisclose().getChannel()))
+                ||(null!=construction.getDisclose().getOtherProblem()&&!"".equals(construction.getDisclose().getOtherProblem()))
+        ){
             model.addAttribute("pass_construction6","0");
         }else {
             if ("有".equals(construction.getDisclose().getHiddenDanger())||

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

@@ -425,7 +425,7 @@ public class ConstructionController extends BaseController {
         String implemented = disclose.getImplemented();
         //变压器无负荷
         String transformer = disclose.getTransformer();
-        //项目实施必要性说明
+        //项目实施必要性描述
         String explanationOfNecessity = disclose.getExplanationOfNecessity();
         //线路名称一致性
         String lineName = disclose.getLineName();
@@ -433,18 +433,20 @@ public class ConstructionController extends BaseController {
         String quantities = disclose.getQuantities();
         //设备、开关、杆号一致性
         String rodNumber = disclose.getRodNumber();
-        //图纸现场不一致说明
+        //图纸现场不一致描述
         String inconsistentDescription = disclose.getInconsistentDescription();
         //政处类型
         String administrationType = disclose.getAdministrationType();
         //前置条件
         String precondition = disclose.getPrecondition();
-        //政策处理说明
+        //政策处理描述
         String policyHandlingInstructions = disclose.getPolicyHandlingInstructions();
         //DTU安放方式核查
         String placementMode = disclose.getPlacementMode();
         //核查环网柜生产日期
         String productionDate = disclose.getProductionDate();
+        //其它问题类型
+        String otherProblem = disclose.getOtherProblem();
         if ("是".equals(capacity)) {
             if ("".equals(sceneSize) || "".equals(capacitySize)) {
                 j.setMsg("现场设备尺寸、最多可扩容尺寸需填写");
@@ -453,19 +455,27 @@ public class ConstructionController extends BaseController {
             }
         } else if ("有".equals(hiddenDanger) || "是".equals(influenceConstruction)|| "是".equals(projectRepetition)|| "是".equals(implemented)|| "无".equals(transformer)) {
             if ("".equals(explanationOfNecessity) || explanationOfNecessity == null) {
-                j.setMsg("必要性问题说明不能为空");
+                j.setMsg("必要性问题描述不能为空");
                 j.setSuccess(false);
                 flag = false;
             }
         }else if ("不一致".equals(lineName)||"否".equals(quantities)||"不一致".equals(rodNumber)) {
             if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
-                j.setMsg("图纸现场不一致说明不能为空");
+                j.setMsg("图纸现场不一致描述不能为空");
                 j.setSuccess(false);
                 flag = false;
             }
-        }else if (("1.农村政处".equals(administrationType)||"2.民事政处/行政政处（公路/水利）".equals(administrationType)||"3.行政政处（城区道路）".equals(administrationType))) {
+        }else if (
+                "1.农村政处".equals(administrationType)
+                ||"2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                ||"3.行政政处（城区道路）".equals(administrationType)
+                ||"1.农村政处;2.民事政处/行政政处（公路/水利）".equals(administrationType)
+                ||"1.农村政处;3.行政政处（城区道路）".equals(administrationType)
+                ||"2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+                ||"1.农村政处;2.民事政处/行政政处（公路/水利）;3.行政政处（城区道路）".equals(administrationType)
+        ) {
             if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
-                j.setMsg("政策处理说明不能为空");
+                j.setMsg("政策处理描述不能为空");
                 j.setSuccess(false);
                 flag = false;
             }

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

@@ -158,7 +158,7 @@ public class DivideController extends BaseController {
 
 
     /**
-     * 旧）导入交底结论，未使用
+     * 项目经理审核时使用交底结论
      * */
     @ResponseBody
     @RequestMapping(value = "importConclusion")
@@ -204,6 +204,7 @@ public class DivideController extends BaseController {
                     disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
                     disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
                     disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
+                    disclose.setOtherProblem(ei.getCellValue(row, 27).toString());
                 }
             }
             try {
@@ -240,7 +241,7 @@ public class DivideController extends BaseController {
 
 
     /**
-     * 新导入交底结论（使用中）
+     * 项目经理组织交底使用导入
      */
 //    @RequiresPermissions("modules:sg:information:information:import")
     @ResponseBody
@@ -292,6 +293,7 @@ public class DivideController extends BaseController {
                 disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
                 disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
                 disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
+                disclose.setOtherProblem(ei.getCellValue(row, 27).toString());
                 discloseList.add(disclose);
             }
             //记录所有符合情况的数据
@@ -331,7 +333,10 @@ public class DivideController extends BaseController {
                     //前置条件，人工判断
                     vars.put("pass4",false);
                     //判断是否有前置条件
-                    if ((precondition != null && !"".equals(precondition)) || (d.getChannel() != null && !"".equals(d.getChannel()) && !"无".equals(d.getChannel()))) {
+                    if ((d.getOtherProblem() != null && !"".equals(d.getOtherProblem()))
+                        ||(precondition != null && !"".equals(precondition))
+                        || (d.getChannel() != null && !"".equals(d.getChannel()) && !"无".equals(d.getChannel()))
+                    ) {
                         vars.put("problem", false);
                         vars.put("pass4", true);
                         vars.put("processer", user.getProjectManageRole());

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -108,6 +108,18 @@
 			<if test="preConstruction != null">
 				and a.preConstruction = #{preConstruction}
 			</if>
+			<if test="projectId != null and  projectId != ''">
+				and a.project_id = #{projectId}
+			</if>
+			<if test="projectNumber != null and projectNumber != ''">
+				and a.project_number = #{projectNumber}
+			</if>
+			<if test="projectName != null and projectName != ''">
+				and a.project_name LIKE
+			 	<if test="dbName == 'oracle'">'%'||#{projectName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectName},'%')</if>
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/CapitalExport.java

@@ -1,5 +1,7 @@
 package com.jeeplus.modules.sg.picking.activiti.entity;
 
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
 /**
  * 导出实体类
  */
@@ -63,7 +65,7 @@ public class CapitalExport {
     //电商平台技术规范书ID
     private String idOfCommerce;
 
-
+    @ExcelField(title="编号", align=2, sort=1)
     public String getErpNumber() {
         return erpNumber;
     }
@@ -72,6 +74,7 @@ public class CapitalExport {
         this.erpNumber = erpNumber;
     }
 
+    @ExcelField(title="单体工程WBS编码", align=2, sort=2)
     public String getProjectWbsNumber() {
         return projectWbsNumber;
     }
@@ -80,6 +83,7 @@ public class CapitalExport {
         this.projectWbsNumber = projectWbsNumber;
     }
 
+    @ExcelField(title="单体工程名称", align=2, sort=3)
     public String getProjectName() {
         return projectName;
     }
@@ -88,6 +92,7 @@ public class CapitalExport {
         this.projectName = projectName;
     }
 
+    @ExcelField(title="WBS元素编码", align=2, sort=4)
     public String getWbsNumber() {
         return wbsNumber;
     }
@@ -96,6 +101,7 @@ public class CapitalExport {
         this.wbsNumber = wbsNumber;
     }
 
+    @ExcelField(title="WBS描述", align=2, sort=5)
     public String getWbsDescription() {
         return wbsDescription;
     }
@@ -104,6 +110,7 @@ public class CapitalExport {
         this.wbsDescription = wbsDescription;
     }
 
+    @ExcelField(title="设备序号", align=2, sort=6)
     public String getDeviceSerialNumber() {
         return deviceSerialNumber;
     }
@@ -112,6 +119,7 @@ public class CapitalExport {
         this.deviceSerialNumber = deviceSerialNumber;
     }
 
+    @ExcelField(title="非安装设备标识", align=2, sort=7)
     public String getIdentification() {
         return identification;
     }
@@ -120,6 +128,7 @@ public class CapitalExport {
         this.identification = identification;
     }
 
+    @ExcelField(title="建筑及线路资产标识", align=2, sort=8)
     public String getBuildLines() {
         return buildLines;
     }
@@ -128,6 +137,7 @@ public class CapitalExport {
         this.buildLines = buildLines;
     }
 
+    @ExcelField(title="建筑及设备名称", align=2, sort=9)
     public String getNameOfBuilding() {
         return nameOfBuilding;
     }
@@ -136,6 +146,7 @@ public class CapitalExport {
         this.nameOfBuilding = nameOfBuilding;
     }
 
+    @ExcelField(title="型号规格", align=2, sort=10)
     public String getModelSpecification() {
         return modelSpecification;
     }
@@ -144,6 +155,7 @@ public class CapitalExport {
         this.modelSpecification = modelSpecification;
     }
 
+    @ExcelField(title="设备类型", align=2, sort=11)
     public String getEquipmentType() {
         return equipmentType;
     }
@@ -152,6 +164,7 @@ public class CapitalExport {
         this.equipmentType = equipmentType;
     }
 
+    @ExcelField(title="SAP物料编码", align=2, sort=12)
     public String getSapMaterialCode() {
         return sapMaterialCode;
     }
@@ -160,6 +173,7 @@ public class CapitalExport {
         this.sapMaterialCode = sapMaterialCode;
     }
 
+    @ExcelField(title="SAP物料扩展编码", align=2, sort=13)
     public String getSapExtensionCode() {
         return sapExtensionCode;
     }
@@ -168,6 +182,7 @@ public class CapitalExport {
         this.sapExtensionCode = sapExtensionCode;
     }
 
+    @ExcelField(title="单位", align=2, sort=14)
     public String getCompany() {
         return company;
     }
@@ -176,6 +191,7 @@ public class CapitalExport {
         this.company = company;
     }
 
+    @ExcelField(title="数量", align=2, sort=15)
     public String getNumber() {
         return number;
     }
@@ -184,6 +200,7 @@ public class CapitalExport {
         this.number = number;
     }
 
+    @ExcelField(title="概算价格", align=2, sort=16)
     public String getEstimatedPrice() {
         return estimatedPrice;
     }
@@ -192,6 +209,7 @@ public class CapitalExport {
         this.estimatedPrice = estimatedPrice;
     }
 
+    @ExcelField(title="需求日期", align=2, sort=17)
     public String getDemandDate() {
         return demandDate;
     }
@@ -200,6 +218,7 @@ public class CapitalExport {
         this.demandDate = demandDate;
     }
 
+    @ExcelField(title="交货地点及交货方式", align=2, sort=18)
     public String getDeliveryPlace() {
         return deliveryPlace;
     }
@@ -208,6 +227,7 @@ public class CapitalExport {
         this.deliveryPlace = deliveryPlace;
     }
 
+    @ExcelField(title="需求计划备注", align=2, sort=19)
     public String getDemandPlan() {
         return demandPlan;
     }
@@ -216,6 +236,7 @@ public class CapitalExport {
         this.demandPlan = demandPlan;
     }
 
+    @ExcelField(title="需求部门", align=2, sort=20)
     public String getDemandDepartment() {
         return demandDepartment;
     }
@@ -224,6 +245,7 @@ public class CapitalExport {
         this.demandDepartment = demandDepartment;
     }
 
+    @ExcelField(title="申请人", align=2, sort=21)
     public String getApplicant() {
         return applicant;
     }
@@ -232,6 +254,7 @@ public class CapitalExport {
         this.applicant = applicant;
     }
 
+    @ExcelField(title="电话号码", align=2, sort=22)
     public String getPhoneNumber() {
         return phoneNumber;
     }
@@ -239,4 +262,67 @@ public class CapitalExport {
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
+
+    @ExcelField(title="前期厂家", align=2, sort=23)
+    public String getPreviousManufacturers() {
+        return previousManufacturers;
+    }
+
+    public void setPreviousManufacturers(String previousManufacturers) {
+        this.previousManufacturers = previousManufacturers;
+    }
+
+    @ExcelField(title="自行采购标识", align=2, sort=24)
+    public String getSelfPurchaseIdentification() {
+        return selfPurchaseIdentification;
+    }
+
+    public void setSelfPurchaseIdentification(String selfPurchaseIdentification) {
+        this.selfPurchaseIdentification = selfPurchaseIdentification;
+    }
+
+    @ExcelField(title="特殊采购标识", align=2, sort=25)
+    public String getSpecialPurchaseIdentification() {
+        return specialPurchaseIdentification;
+    }
+
+    public void setSpecialPurchaseIdentification(String specialPurchaseIdentification) {
+        this.specialPurchaseIdentification = specialPurchaseIdentification;
+    }
+
+    @ExcelField(title="使用环境", align=2, sort=26)
+    public String getUseEnvironment() {
+        return useEnvironment;
+    }
+
+    public void setUseEnvironment(String useEnvironment) {
+        this.useEnvironment = useEnvironment;
+    }
+
+    @ExcelField(title="合同草稿号", align=2, sort=27)
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    @ExcelField(title="合同草稿行项目号", align=2, sort=28)
+    public String getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(String itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    @ExcelField(title="电商平台技术规范书ID", align=2, sort=29)
+    public String getIdOfCommerce() {
+        return idOfCommerce;
+    }
+
+    public void setIdOfCommerce(String idOfCommerce) {
+        this.idOfCommerce = idOfCommerce;
+    }
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/CostDerivation.java

@@ -1,6 +0,0 @@
-package com.jeeplus.modules.sg.picking.activiti.entity;
-/**
- * 成本项目导出类
- * */
-public class CostDerivation {
-}

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/PickIngMapper.java

@@ -7,10 +7,7 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
-import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickIng;
-import com.jeeplus.modules.sg.picking.activiti.entity.ProjectNumber;
-import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,4 +43,8 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
      * 获取选择项目的流程实例id与类型
      * */
     List<Acquisition> findErpType(List<String> list);
+
+    List<CapitalExport> exportList(List<Acquisition> list);
+
+    void updateErpAfter(List<Acquisition> list);
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/ShowListMapper.java

@@ -84,10 +84,15 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
     /**
      * 所有项目的领料单
      */
-    List<Acquisition> acquisitionList();
+    List<Acquisition> acquisitionList(Acquisition acquisition);
 
     /**
      * 记录项目中心领导审核领料单通过时间
      */
     void updateManagerTime(String procInsId);
+
+    /**
+     * 查询出所有可以领料的id
+     */
+    List<String> selectAllId();
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/PickIngMapper.xml

@@ -168,11 +168,41 @@
 		LEFT JOIN xm_project_details as b
 		on a.project_id = b.id where a.id
 		in(
-		(
 		<foreach collection="list" item="item" separator=",">
 			#{item}
 		</foreach>
 		)
+	</select>
+
+	<select id="exportList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.CapitalExport">
+		select
+		a.materialCode as sapMaterialCode,
+		a.extensionDescription as deviceSerialNumber,
+		a.materialDescription as nameOfBuilding,
+		a.mdUnits as company,
+		c.require_name as projectName,
+		c.project_number as projectWbsNumber,
+		d.referencePrice as estimatedPrice
+		from md_process_list as a
+		LEFT JOIN md_acquisition_process as b
+			on a.procInsId = b.proc_ins_id
+		LEFT JOIN xm_project_details as c
+			on b.project_id = c.id
+		LEFT JOIN xm_material_provided as d
+			on a.materialCode = d.materialCode
+		where b.id in(
+			<foreach collection="list" item="item" separator=",">
+				#{item.id}
+			</foreach>
 		)
+
 	</select>
+	
+	<update id="updateErpAfter">
+		update md_acquisition_process set exportAfter = '是',exportTime = now() where id in (
+		<foreach collection="list" item="item" separator=",">
+			#{item.id}
+		</foreach>
+		);
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -255,10 +255,17 @@
 		left join xm_project_details as b
 		on a.project_id = b.id
 		where exportStatus = '1'
-		order by exportAfter;
+		order by managerTime desc,exportAfter desc
 	</select>
 
 	<update id="updateManagerTime">
 		update md_acquisition_process set managerTime = NOW(),exportStatus = 1 where proc_ins_id = #{procInsId};
 	</update>
+
+	<select id="selectAllId" resultType="java.lang.String">
+		select
+		a.id
+		from md_acquisition_process as a
+		where exportStatus = '1'
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -19,7 +19,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.cert.LDAPCertStoreParameters;
+import java.time.Year;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -162,4 +165,91 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	public List<Acquisition> findErpType(List<String> list) {
 		return pickIngMapper.findErpType(list);
 	}
+	/**
+	 * 成本项目导出
+	 * */
+	@Transactional(readOnly = false)
+	public List<CapitalExport> cbList(List<Acquisition> list) {
+		List<CapitalExport> capitalExports = pickIngMapper.exportList(list);
+		int i = 0;
+		for (CapitalExport c : capitalExports) {
+			//项目定义号
+			String projectWbsNumber = c.getProjectWbsNumber();
+			i = i + 1;
+			c.setErpNumber(String.valueOf(i));
+			c.setProjectWbsNumber(projectWbsNumber+"0010000000");
+			c.setWbsNumber(projectWbsNumber+"0012000000");
+			c.setWbsDescription("配网检修-外包材料费");
+			c.setDeviceSerialNumber("999999");
+			c.setModelSpecification(c.getNameOfBuilding());
+			Calendar date = Calendar.getInstance();
+			String year = String.valueOf(date.get(Calendar.YEAR));
+			c.setDemandDate(year + "1230");
+			c.setDeliveryPlace("买方指定仓库车板交货");
+			c.setDemandDepartment("建设部（项目管理中心）");
+			c.setApplicant("沈忱");
+			c.setPhoneNumber("0511-84028133");
+			c.setIdOfCommerce("A448-500001083-00004");
+		}
+		updateErpAfter(list);
+		return capitalExports;
+	}
+
+	/**
+	 * 资本项目导出
+	 * */
+	@Transactional(readOnly = false)
+	public List<CapitalExport> zbList(List<Acquisition> list) {
+		List<CapitalExport> capitalExports = pickIngMapper.exportList(list);
+		int i = 0;
+		for (CapitalExport c : capitalExports) {
+			//项目定义号
+			String projectWbsNumber = c.getProjectWbsNumber();
+			String deviceSerialNumber = c.getDeviceSerialNumber();
+			i = i + 1;
+			c.setErpNumber(String.valueOf(i));
+			c.setProjectWbsNumber(projectWbsNumber+"00A0000000");
+			c.setWbsNumber(projectWbsNumber+"00A1310000");
+			c.setWbsDescription("变压器");
+			if (deviceSerialNumber != null && !"".equals(deviceSerialNumber)) {
+				if (deviceSerialNumber.contains("变压器")) {
+					c.setDeviceSerialNumber("1");
+					c.setEquipmentType("1302001");
+					c.setUseEnvironment("户外");
+				}else if(deviceSerialNumber.contains("环网柜")||deviceSerialNumber.contains("环网箱")){
+					c.setDeviceSerialNumber("2");
+					c.setEquipmentType("1302004");
+					c.setUseEnvironment("户外");
+				}else if(deviceSerialNumber.contains("箱式变电站")){
+					c.setDeviceSerialNumber("3");
+					c.setEquipmentType("1302003");
+					c.setUseEnvironment("户外");
+				} else if (deviceSerialNumber.contains("高压开关柜")) {
+					c.setDeviceSerialNumber("4");
+					c.setEquipmentType("1302010");
+					c.setUseEnvironment("户外");
+				} else {
+					c.setDeviceSerialNumber("999999");
+				}
+			} else {
+				c.setDeviceSerialNumber("");
+			}
+			c.setModelSpecification(c.getNameOfBuilding());
+			Calendar date = Calendar.getInstance();
+			String year = String.valueOf(date.get(Calendar.YEAR));
+			c.setDemandDate(year + "1230");
+			c.setDeliveryPlace("买方指定仓库车板交货");
+			c.setDemandDepartment("建设部（项目管理中心）");
+			c.setApplicant("沈忱");
+			c.setPhoneNumber("0511-84028133");
+			c.setIdOfCommerce("A448-500001083-00004");
+		}
+		updateErpAfter(list);
+		return capitalExports;
+	}
+
+	@Transactional(readOnly = false)
+	public void updateErpAfter(List<Acquisition> list) {
+		pickIngMapper.updateErpAfter(list);
+	}
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -44,7 +44,7 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	public Page<Acquisition> acquisitionList(Page<Acquisition> page,Acquisition acquisition){
 		dataRuleFilter(acquisition);
 		acquisition.setPage(page);
-		page.setList(mapper.acquisitionList());
+		page.setList(mapper.acquisitionList(acquisition));
 		return page;
 	}
 
@@ -127,4 +127,8 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	public void updateManagerTime(String procInsId) {
 		showListMapper.updateManagerTime(procInsId);
 	}
+
+	public List<String> selectAllId() {
+		return showListMapper.selectAllId();
+	}
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -4,12 +4,14 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 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.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.OutInformation;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
@@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -496,11 +499,18 @@ public class PickIngController extends BaseController {
     @RequestMapping(value = "exportErpData")
     public AjaxJson exportErpData(String id, HttpServletRequest request, HttpServletResponse response) {
         AjaxJson j = new AjaxJson();
-        String[] split = id.split(",");
         List<String> beforeId = new ArrayList<>();
-        for (String a : split) {
-            beforeId.add(a);
+        if (id != null && !"".equals(id)) {
+            String[] split = id.split(",");
+            for (String a : split) {
+                beforeId.add(a);
+            }
+        } else {
+            beforeId = showListService.selectAllId();
         }
+
+
+
         //获取选择的id查询出属于什么项目
         List<Acquisition> erpType = pickIngService.findErpType(beforeId);
         //资本项目列表
@@ -518,6 +528,29 @@ public class PickIngController extends BaseController {
             }
         }
         //根据不同类型导出不同的文件
+        if (zbList.size()>0) {
+            try {
+                String fileName = "导出资本ERP" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+                List<CapitalExport> capitalExports = pickIngService.zbList(zbList);
+                new ExportExcel("导出资本ERP", CapitalExport.class).setDataList(capitalExports).write(response, fileName).dispose();
+                j.setSuccess(true);
+                j.setMsg("导出成功！");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+        if (cbList.size()>0) {
+            try {
+                String fileName = "导出成本ERP" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+                List<CapitalExport> capitalExports = pickIngService.cbList(zbList);
+                new ExportExcel("导出成本ERP", CapitalExport.class).setDataList(capitalExports).write(response, fileName).dispose();
+                j.setSuccess(true);
+                j.setMsg("导出成功！");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
 
         //需改导出状态及导出时间
         return j;

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

@@ -121,10 +121,6 @@
 								<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>
@@ -234,10 +230,6 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacity}
-										<%--<select id="capacity"  maxlength="100"  class=" form-control">
-										<option value="是">是</option>
-										<option value="否">否</option>
-									</select>--%>
 								</td>
 							</tr>
 							<tr>
@@ -275,34 +267,45 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-15 active"><label class="pull-right">项目实施必要性描述</label></td>
 								<td class="width-35">
-										${construction.disclose.lineName}
+										${construction.disclose.explanationOfNecessity}
 								</td>
 							</tr>
 							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-35">
+										${construction.disclose.lineName}
+								</td>
 								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
 								<td class="width-35">
 										${construction.disclose.quantities}
 								</td>
+							</tr>
+							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
+								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
+								<td class="width-35">
+										${construction.disclose.inconsistentDescription}
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
 								<td class="width-35">
+										${construction.disclose.precondition}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
-										${construction.disclose.precondition}
+										${construction.disclose.policyHandlingInstructions}
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
 								<td class="width-35">

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

@@ -62,10 +62,6 @@
 								<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>
@@ -81,70 +77,26 @@
 								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly"  id='projectType'  name="projectType" class="form-control required"  value="${construction.projectType}"/>
-<%--									<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">
-									<input type='text' readonly="readonly"  id='preliminaryJudgment'  name="preliminaryJudgment" class="form-control required"  value="${construction.preliminaryJudgment}"/>
-<%--									<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">
 									<input type='text' readonly="readonly"  id='civilEngineering'  name="civilEngineering" class="form-control required"  value="${construction.civilEngineering}"/>
-<%--									<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">
 									<input type='text' readonly="readonly"  id='baseType'  name="baseType" class="form-control required"  value="${construction.baseType}"/>
-<%--									<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">
 									<input type='text' readonly="readonly"  id='planApproval'  name="planApproval" class="form-control required"  value="${construction.planApproval}"/>
-<%--									<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">
 									<input type='text' readonly="readonly"  id='transformationType'  name="transformationType" class="form-control required"  value="${construction.transformationType}"/>
-<%--									<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>
@@ -155,67 +107,37 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly"  id='newNamed'  name="newNamed" class="form-control required"  value="${construction.newNamed}"/>
-									<%--<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">
 									<input type='text' readonly="readonly"  id='putInto'  name="putInto" class="form-control required"  value="${construction.putInto}"/>
-									<%--<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">
 									<input type='text' readonly="readonly"  id='electricalConstruction'  name="electricalConstruction" class="form-control required"  value="${construction.electricalConstruction}"/>
-<%--									<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">
 									<input type='text' readonly="readonly"  id='theAssignment'  name="theAssignment" class="form-control required"  value="${construction.theAssignment}"/>
-									<%--<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">
 									<input type='text' readonly="readonly"  id='automation'  name="automation" class="form-control required"  value="${construction.automation}"/>
-									<%--<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">
 									<input type='text' readonly="readonly"  id='remote'  name="remote" class="form-control required"  value="${construction.remote}"/>
-									<%--<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">
 									<input type='text' readonly="readonly"  id='communicationMode'  name="communicationMode" class="form-control required"  value="${construction.communicationMode}"/>
-									<%--<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>
@@ -223,19 +145,13 @@
 								<td class="width-35">
 									<div>
 										<input type='text' readonly="readonly"  id='inSitu'  name="inSitu" class="form-control required"  value="${construction.blackoutArea}"/>
-										<%--<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">
 									<input type='text' readonly="readonly"  id='networkCabinet'  name="networkCabinet" class="form-control required"  value="${construction.networkCabinet}"/>
-									<%--<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>
@@ -246,17 +162,13 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly"  id='powerFailure'  name="powerFailure" class="form-control required"  value="${construction.powerFailure}"/>
-								<%--<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>
 
-
 					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
 						<div class="row">
 							<div class="col-sm-3"></div>

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

@@ -39,12 +39,10 @@
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="true"></sys:itemselect>
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="true"></sys:itemselect>
 								</td>
 								</td>
 							</tr>
-							<tr>
-							</tr>
 							</tbody>
 						</table>
 

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

@@ -246,7 +246,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -266,7 +266,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -282,7 +282,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -207,7 +207,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -227,7 +227,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -243,7 +243,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -121,10 +121,6 @@
 								<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">
-									<input type="text" class="form-control" id="remark" name="remark" value="">
-								</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>

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

@@ -200,7 +200,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
-								<td class="width-15 active"><label class="pull-right">项目实施必要性说明</label></td>
+								<td class="width-15 active"><label class="pull-right">项目实施必要性描述</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='explanationOfNecessity'  name="needReplace" class="form-control required"  value="${construction.disclose.explanationOfNecessity}"/>
 								</td>
@@ -243,7 +243,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
-								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='inconsistentDescription'  name="overallTransformation" class="form-control required"  value="${construction.disclose.inconsistentDescription}"/>
 								</td>
@@ -267,7 +267,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='policyHandlingInstructions'  name="needReplace" class="form-control required"  value="${construction.disclose.policyHandlingInstructions}"/>
 								</td>
@@ -304,6 +304,12 @@
 									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value="${construction.disclose.overallTransformation}"/>
 								</td>
 							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">其它问题类型：</label></td>
+								<td class="width-35">
+									<input type='text' readonly="readonly" id='otherProblem'  name="otherProblem" class="form-control required"  value="${construction.disclose.otherProblem}"/>
+								</td>
+							</tr>
 							</tbody>
 						</table>
 					</form:form>

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

@@ -243,7 +243,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -263,7 +263,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -279,7 +279,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -106,7 +106,7 @@
 										<form:option value="无"/>
 									</form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">项目实施必要性说明</label></td>
+                                <td class="width-15 active"><label class="pull-right">项目实施必要性描述</label></td>
                                 <td class="width-35">
 									<form:input path="disclose.explanationOfNecessity" cssClass="form-control"/>
                                 </td>
@@ -135,7 +135,7 @@
 										<form:option value="不一致"/>
 									</form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right"> 图纸现场不一致说明：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
                                 <td class="width-35">
 									<form:input path="disclose.inconsistentDescription" cssClass="form-control"/>
                                 </td>
@@ -161,7 +161,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
                                 <td class="width-35">
 									<form:input path="disclose.policyHandlingInstructions" cssClass="form-control"/>
                                 </td>
@@ -204,6 +204,12 @@
 									</form:select>
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">其它问题类型：</label></td>
+                                <td class="width-35">
+                                    <form:input path="disclose.otherProblem" cssClass="form-control"/>
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

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

@@ -257,7 +257,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -277,7 +277,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -293,7 +293,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -262,7 +262,6 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
-										${construction.disclose.politicalProblem}
 								</td>
 							</tr>
 							<tr>

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

@@ -228,7 +228,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -248,7 +248,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -264,7 +264,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -244,7 +244,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -264,7 +264,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -280,7 +280,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -244,7 +244,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -264,7 +264,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -280,7 +280,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -244,7 +244,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -264,7 +264,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -280,7 +280,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

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

@@ -228,7 +228,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.explanationOfNecessity}
 								</td>
@@ -248,7 +248,7 @@
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.inconsistentDescription}
 								</td>
@@ -264,7 +264,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理说明：</label></td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
 								<td class="width-35">
 										${construction.disclose.policyHandlingInstructions}
 								</td>

src/main/webapp/webpage/modules/sg/picking/activiti/exportErp.js

@@ -10,9 +10,9 @@ $(document).ready(function() {
 			dataType: "json",
 			contentType: "application/x-www-form-urlencoded",
 			//显示检索按钮
-			showSearch: false,
+			showSearch: true,
 			//显示刷新按钮
-			showRefresh: false,
+			showRefresh: true,
 			//显示切换手机试图按钮
 			showToggle: false,
 			//显示 内容列下拉框
@@ -20,7 +20,7 @@ $(document).ready(function() {
 			//显示到处按钮
 			showExport: false,
 			//显示切换分页按钮
-			showPaginationSwitch: false,
+			showPaginationSwitch: true,
 			//最低显示2行
 			minimumCountColumns: 2,
 			//是否显示行间隔色
@@ -28,7 +28,7 @@ $(document).ready(function() {
 			//是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
 			cache: false,
 			//是否显示分页（*）
-			pagination: false,
+			pagination: true,
 			//排序方式
 			sortOrder: "asc",
 			//初始化加载第一页，默认第一页
@@ -103,7 +103,6 @@ $(document).ready(function() {
 	$('#informationTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
 		'check-all.bs.table uncheck-all.bs.table', function () {
 		$('#remove').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
-		$('#exportErp').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
 		$('#view,#edit').prop('disabled', $('#informationTable').bootstrapTable('getSelections').length!=1);
 	});
 
@@ -136,5 +135,6 @@ $(document).ready(function() {
 			id = getIdSelections();
 		}
 		jp.downloadFile('${ctx}/picking/activiti/exportErpData?id=' + id);
+		refresh();
 	}
 </script>

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

@@ -14,9 +14,19 @@
 			<div class="panel-heading">
 				<h3 class="panel-title">导出erp管理</h3>
 			</div>
-				<button id="exportErp" class="btn btn-warning" onclick="exportErp()">
-					<i class="fa fa-file-excel-o"></i>导出erp
-				</button>
+			<div id="search-collapse" class="collapse">
+				<div class="accordion-inner">
+					<form:form id="searchForm" modelAttribute="acquisition" class="form form-horizontal well clearfix">
+						<div class="col-xs-12 col-sm-6 col-md-4">
+							<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
+							<form:input path="projectId" htmlEscape="false" class="form-control"/>
+						</div>
+					</form:form>
+				</div>
+			</div>
+			<button style="margin: 10px 0px 0px 10px;" id="exportErp" class="btn btn-warning" onclick="exportErp()">
+				<i class="fa fa-file-excel-o"></i>导出erp
+			</button>
 			<table id="informationTable"  data-toolbar="#toolbar" class="table"></table>
 		</div>
 	</div>