流程待办列表的搜索，储备项目名称，项目编号，项目名称

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

@@ -15,6 +15,7 @@ import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.ReturnTodo;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
@@ -143,8 +144,9 @@ public class ActTaskService extends BaseService {
      *
      * @return
      */
-    public Page<HashMap<String, String>> newTodoList(Page<HashMap<String, String>> page, Act act, String xmName) {
+    public Page<HashMap<String, String>> newTodoList(Page<HashMap<String, String>> page, Act act, String reserveProjectName,String projectId,String projectName) {
         List<HashMap<String, String>> result = new ArrayList<HashMap<String, String>>();
+        Project project = new Project();
         String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId());
 
         // =============== 已经签收的任务  ===============
@@ -163,7 +165,59 @@ public class ActTaskService extends BaseService {
         if (act.getEndDate() != null) {
             todoTaskQuery.taskCreatedBefore(act.getEndDate());
         }
-        if (!"".equals(xmName) && xmName != null) {
+        if ((null!=reserveProjectName &&!"".equals(reserveProjectName)) || (null!=projectId && !"".equals(projectId)) || (null!=projectName && !"".equals(projectName))) {
+            if (null!= reserveProjectName && !"".equals(reserveProjectName)) {
+                project.setReserveProjectName(reserveProjectName);
+            }
+            if (null!= projectId && !"".equals(projectId)) {
+                project.setProjectId(projectId);
+            }
+            if (null!= projectName && !"".equals(projectName)) {
+                project.setProjectName(projectName);
+            }
+            ReturnTodo procInsIDAll = constructionService.findProcInsIDAll(project);
+            //通过输入的查询结果获取所有的项目信息
+            if (procInsIDAll!=null) {
+                List<String> strings = new ArrayList<>();
+                String xcProcInsId = procInsIDAll.getXcProcInsId();
+                String scProcInsId = procInsIDAll.getScProcInsId();
+                String xnProcInsId = procInsIDAll.getXnProcInsId();
+                String maProcInsId = procInsIDAll.getMaProcInsId();
+                String xfProcInsId = procInsIDAll.getXfProcInsId();
+                String mmProcInsId = procInsIDAll.getMmProcInsId();
+                String xsProcInsId = procInsIDAll.getXsProcInsId();
+                String mpProcInsId = procInsIDAll.getMpProcInsId();
+                if (null!=xcProcInsId && !"".equals(xcProcInsId)) {
+                    strings.add(xcProcInsId);
+                }
+                if (null!=scProcInsId && !"".equals(scProcInsId)) {
+                    strings.add(scProcInsId);
+                }
+                if (null!=xnProcInsId && !"".equals(xnProcInsId)) {
+                    strings.add(xnProcInsId);
+                }
+                if (null!=maProcInsId && !"".equals(maProcInsId)) {
+                    strings.add(maProcInsId);
+                }
+                if (null!=xfProcInsId && !"".equals(xfProcInsId)) {
+                    strings.add(xfProcInsId);
+                }
+                if (null!=mmProcInsId && !"".equals(mmProcInsId)) {
+                    strings.add(mmProcInsId);
+                }
+                if (null!=xsProcInsId && !"".equals(xsProcInsId)) {
+                    strings.add(xsProcInsId);
+                }
+                if (null!=mpProcInsId && !"".equals(mpProcInsId)) {
+                    strings.add(mpProcInsId);
+                }
+
+                if (null != strings && strings.size() > 0) {
+                    todoTaskQuery.processInstanceIdIn(strings);
+                }
+            }
+        }
+/*        if (!"".equals(xmName) && xmName != null) {
             List<String> strings = constructionService.insIdByName(xmName);
             if (strings != null && strings.size() > 0) {
                 todoTaskQuery.processInstanceIdIn(strings);
@@ -171,7 +225,7 @@ public class ActTaskService extends BaseService {
                 strings.add("");
                 todoTaskQuery.processInstanceIdIn(strings);
             }
-        }
+        }*/
 
 
         // =============== 等待签收的任务  ===============
@@ -226,8 +280,14 @@ public class ActTaskService extends BaseService {
             map.put("task.executionId", task.getExecutionId());
             map.put("task.processDefinitionId", task.getProcessDefinitionId());
             map.put("task.processInstanceId", task.getProcessInstanceId());
-            String s = constructionService.idProjectName(task.getProcessInstanceId());
-            if ("".equalsIgnoreCase(s) || null == s) {
+            project.setProcInsId(task.getProcessInstanceId());
+            Project s = constructionService.procInsIdAllName(project);
+            if (null!=s && !"".equals(s)) {
+                map.put("task.projectId", s.getProjectId());
+                map.put("task.projectName", s.getProjectName());
+                map.put("task.reserveProjectName", s.getReserveProjectName());
+            }
+            /*if ("".equalsIgnoreCase(s) || null == s) {
                 String s2 = constructionService.idProjectName3(task.getProcessInstanceId());
                 if ("".equalsIgnoreCase(s2) || null == s2) {
                     String s1 = constructionService.idProjectName2(task.getProcessInstanceId());
@@ -245,7 +305,7 @@ public class ActTaskService extends BaseService {
                 }
             }else {
                 map.put("task.projectName", s);
-            }
+            }*/
             map.put("task.taskDefinitionKey", task.getTaskDefinitionKey());
             map.put("vars", task.getProcessVariables());
             map.put("procDef.name", ProcessDefCache.get(task.getProcessDefinitionId()).getName());

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

@@ -155,10 +155,10 @@ public class ActTaskController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "todo/data")
-    public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String xmName) throws Exception {
+    public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String reserveProjectName,String projectId,String projectName) throws Exception {
 /*        Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
         return getBootstrapData(page);*/
-        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, xmName);
+        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, reserveProjectName, projectId, projectName);
         Map<String, Object> map = new HashMap<String, Object>();
         return getBootstrapData(page);
     }

src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java

@@ -124,7 +124,6 @@ public class AdvanceController extends BaseController {
 		}
 		showListService.newSave(pickApplication);
 		// 启动流程
-		// 启动流程
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("noPass", false);
 		vars.put("pass", false);

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

@@ -0,0 +1,88 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+/**
+ * @author enford
+ *记录查询结构流程实例id实体类
+ */
+public class ReturnTodo {
+    /**施工交底*/
+    private String xcProcInsId;
+    /**施工验收*/
+    private String scProcInsId;
+    /**土建流程表*/
+    private String xnProcInsId;
+    /**领料流程*/
+    private String maProcInsId;
+    /**转资流程*/
+    private String xfProcInsId;
+    /**提前流程*/
+    private String mmProcInsId;
+    /**结算流程*/
+    private String xsProcInsId;
+    /**人工申请项目领料*/
+    private String mpProcInsId;
+
+    public String getXcProcInsId() {
+        return xcProcInsId;
+    }
+
+    public void setXcProcInsId(String xcProcInsId) {
+        this.xcProcInsId = xcProcInsId;
+    }
+
+    public String getScProcInsId() {
+        return scProcInsId;
+    }
+
+    public void setScProcInsId(String scProcInsId) {
+        this.scProcInsId = scProcInsId;
+    }
+
+    public String getXnProcInsId() {
+        return xnProcInsId;
+    }
+
+    public void setXnProcInsId(String xnProcInsId) {
+        this.xnProcInsId = xnProcInsId;
+    }
+
+    public String getMaProcInsId() {
+        return maProcInsId;
+    }
+
+    public void setMaProcInsId(String maProcInsId) {
+        this.maProcInsId = maProcInsId;
+    }
+
+    public String getXfProcInsId() {
+        return xfProcInsId;
+    }
+
+    public void setXfProcInsId(String xfProcInsId) {
+        this.xfProcInsId = xfProcInsId;
+    }
+
+    public String getMmProcInsId() {
+        return mmProcInsId;
+    }
+
+    public void setMmProcInsId(String mmProcInsId) {
+        this.mmProcInsId = mmProcInsId;
+    }
+
+    public String getXsProcInsId() {
+        return xsProcInsId;
+    }
+
+    public void setXsProcInsId(String xsProcInsId) {
+        this.xsProcInsId = xsProcInsId;
+    }
+
+    public String getMpProcInsId() {
+        return mpProcInsId;
+    }
+
+    public void setMpProcInsId(String mpProcInsId) {
+        this.mpProcInsId = mpProcInsId;
+    }
+}

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

@@ -5,10 +5,8 @@ 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.EngineeringAmount;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -101,6 +99,16 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     String idProjectName4(@Param("procInsId") String procInsId);
 
+    /**通过流程定义号再不同的流程表中查询对应的储备项目名称，通过关联项目表获得项目定义号及项目名称，
+     * @return  返回项目的信息list
+     * @param project 流程定义号 */
+    Project procInsIdAllName(Project project);
+
+    /**通过储备项目名称，项目定义号，项目名称查询复合条件的流程定义号返回
+     * @return  返回符合条件的procInsId
+     * @param project 查询条件 */
+    ReturnTodo findProcInsIDAll(Project project);
+
     List<String> insIdByName(String projectName);
 
     List<String> insIdByName2(String projectName);

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

@@ -823,6 +823,69 @@
         from xm_other_amount
         where id = #{id};
     </select>
+    <select id="procInsIdAllName" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+        SELECT
+            xmp.id,
+            xmp.reserveProjectName,
+            xmp.projectId,
+            xmp.projectName
+        FROM
+            xm_material_project xmp
+                LEFT JOIN xm_construction_clarificaiton xcc ON xmp.reserveProjectName = xcc.reserveProjectName
+                LEFT JOIN sg_construction_process scp ON xmp.reserveProjectName = scp.reserveProjectName
+                LEFT JOIN xm_nonpower_process xnp ON xmp.reserveProjectName = xnp.reserveProjectName
+                LEFT JOIN md_acquisition_process map ON xmp.reserveProjectName = map.reserveProjectName
+                LEFT JOIN xm_fund_process xfp ON xmp.reserveProjectName = xfp.reserveProjectName
+                LEFT JOIN md_material_report_application mmra ON xmp.reserveProjectName = mmra.project_name
+                LEFT JOIN xm_settlement_process xsp ON xmp.reserveProjectName = xsp.reserveProjectName
+                LEFT JOIN md_picking_application mpa ON xmp.projectId = mpa.project_id
+        WHERE
+            1=1
+          <if test="procInsId !=null and procInsId !=''">
+           and  xcc.proc_ins_id = #{procInsId}
+           OR scp.proc_ins_id = #{procInsId}
+           OR xnp.proc_ins_id = #{procInsId}
+           OR map.proc_ins_id = #{procInsId}
+           OR xfp.proc_ins_id = #{procInsId}
+           OR mmra.proc_ins_id = #{procInsId}
+           OR xsp.proc_ins_id = #{procInsId}
+           OR mpa.proc_ins_id = #{procInsId}
+          </if>
+    </select>
+    <select id="findProcInsIDAll"
+            resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.ReturnTodo">
+        SELECT
+            xcc.proc_ins_id as `xcProcInsId`,
+            scp.proc_ins_id as `scProcInsId`,
+            xnp.proc_ins_id as `xnProcInsId`,
+            map.proc_ins_id as `maProcInsId`,
+            xfp.proc_ins_id as `xfProcInsId`,
+            mmra.proc_ins_id as `mmProcInsId`,
+            xsp.proc_ins_id as `xsProcInsId`,
+            mpa.proc_ins_id as `mpProcInsId`
+        FROM
+            xm_material_project xmp
+                LEFT JOIN xm_construction_clarificaiton xcc ON xmp.reserveProjectName = xcc.reserveProjectName
+                LEFT JOIN sg_construction_process scp ON xmp.reserveProjectName = scp.reserveProjectName
+                LEFT JOIN xm_nonpower_process xnp ON xmp.reserveProjectName = xnp.reserveProjectName
+                LEFT JOIN md_acquisition_process map ON xmp.reserveProjectName = map.reserveProjectName
+                LEFT JOIN xm_fund_process xfp ON xmp.reserveProjectName = xfp.reserveProjectName
+                LEFT JOIN md_material_report_application mmra ON xmp.reserveProjectName = mmra.project_name
+                LEFT JOIN xm_settlement_process xsp ON xmp.reserveProjectName = xsp.reserveProjectName
+                LEFT JOIN md_picking_application mpa ON xmp.projectId = mpa.project_id
+        <where>
+            1=1
+            <if test="reserveProjectName != null and reserveProjectName != ''">
+                and xmp.reserveProjectName = #{reserveProjectName}
+            </if>
+            <if test="projectId != null and projectId != ''">
+                and xmp.projectId = #{projectId}
+            </if>
+            <if test="projectName != null and projectName != ''">
+                and xmp.projectName = #{projectName}
+            </if>
+        </where>
+    </select>
     <delete id="delEngAmount">
         delete
         from xm_engineering_amount

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

@@ -5,13 +5,11 @@ 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.EngineeringAmount;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.pic.entity.TestPic;
@@ -201,6 +199,18 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return s;
 	}
 
+
+	/**
+	 * 联合查询通过现有流程表中的流程实例id，查询除流程的项目
+	 */
+	public Project procInsIdAllName(Project project) {
+		return constructionMapper.procInsIdAllName(project);
+	}
+
+	public ReturnTodo findProcInsIDAll(Project project) {
+		return constructionMapper.findProcInsIDAll(project);
+	}
+
 	//根据输入的项目名称，分别从流程表中查询对应的项目信息
 	public List<String> insIdByName(String projectName){
 		List<String> strings = constructionMapper.insIdByName(projectName);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/BeforeExport.java

@@ -50,6 +50,8 @@ public class BeforeExport {
     //工区备注
     private String workAreaRemarks;
 
+    private List<String> searchId;
+
     public String getId() {
         return id;
     }
@@ -225,4 +227,12 @@ public class BeforeExport {
     public void setWorkAreaRemarks(String workAreaRemarks) {
         this.workAreaRemarks = workAreaRemarks;
     }
+
+    public List<String> getSearchId() {
+        return searchId;
+    }
+
+    public void setSearchId(List<String> searchId) {
+        this.searchId = searchId;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -54,6 +54,8 @@ public class Project extends DataEntity<Project> {
     private String secondPower;
     //项目类型
     private String projectType;
+    //流程实例id
+    private String procInsId;
 
     public String getReserveProjectName() {
         return reserveProjectName;
@@ -238,4 +240,12 @@ public class Project extends DataEntity<Project> {
     public void setProjectType(String projectType) {
         this.projectType = projectType;
     }
+
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
 }

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

@@ -2016,6 +2016,21 @@
             and
             a.secondPower = 0
             and a.whetherCloseStatus = '0'
+            <if test="reserveProjectName!=null and reserveProjectName!=''">
+                and a.reserveProjectName = #{reserveProjectName}
+            </if>
+            <if test="projectId!=null and projectId!=''">
+                and a.projectId = #{projectId}
+            </if>
+            <if test="projectName!=null and projectName!=''">
+                and a.projectName = #{projectName}
+            </if>
+            <if test="searchId!=null and searchId!=''">
+                and a.id in
+                <foreach collection="searchId" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProjectImportUtil.java

@@ -374,8 +374,7 @@ public class ProjectImportUtil {
                 if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
                     Project assByName = projectMapper.findAssByName(reserveProjectName);
                     Project basicByName = projectMapper.findProByName(reserveProjectName);
-                    List<Project> tearByName = projectMapper.findTearByName(reserveProjectName);
-                    if (assByName == null || basicByName == null || tearByName == null || tearByName.size()<=0) {
+                    if (assByName == null || basicByName == null) {
                         flagStr += reserveProjectName + "请先完善项目的前置信息\n";
                         continue;
                     } else {

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -1492,11 +1492,14 @@ public class ProjectController extends BaseController {
     }
 
     /**
-     *到处项目前期基础信息
+     *导出项目前期基础信息
      * */
     @ResponseBody
     @RequestMapping(value = "btnExport")
     public void exportExcel(Project project, HttpServletRequest request, HttpServletResponse response) {
+
+
+
         StringBuilder stringBuilder = new StringBuilder();
         Template template = null;
         response.setContentType("text/text;charset=utf-8");
@@ -1516,6 +1519,22 @@ public class ProjectController extends BaseController {
         BasicInformation basicInformation = new BasicInformation();
         project.setBasicInformation(basicInformation);
         BeforeExport beforeExport = new BeforeExport();
+        //判断是否有搜索条件
+        //获取项目选择id
+        String id = project.getId();
+        if (null != id && !"".equals(id)) {
+            //根据“，”分割id，如果有选择的id，将其他搜索条件清空
+            String[] split = id.split(",");
+            List<String> searchList = new ArrayList<>();
+            for (int i = 0; i < split.length; i++) {
+                searchList.add(split[i]);
+            }
+            beforeExport.setSearchId(searchList);
+        } else {
+            beforeExport.setReserveProjectName(project.getReserveProjectName());
+            beforeExport.setProjectId(project.getProjectId());
+            beforeExport.setProjectName(project.getProjectName());
+        }
         List<BeforeExport> list = projectService.findBtnExport(beforeExport);
         int i = 1;
         for (BeforeExport s : list) {

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

@@ -28,6 +28,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author enford
+ * 物资上报
+ */
 @Controller
 @RequestMapping(value = "${adminPath}/picking/materialReport")
 public class MaterialReportController extends BaseController {

src/main/java/com/jeeplus/modules/sg/scheduleView/web/ScheduleViewController.java

@@ -107,7 +107,7 @@ public class ScheduleViewController extends BaseController {
     }
 
     /**
-     * 大体项目所有信息
+     * 所有项目大流程进度
      */
     @ResponseBody
     @RequestMapping(value = "allData")

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -77,9 +77,17 @@ $(document).ready(function() {
 
 		    },
 			   {
-				   field: 'task.projectName',
-				   title: '项目名称'
+				   field: 'task.reserveProjectName',
+				   title: '储备项目名称'
 			   },
+				   {
+					   field: 'task.projectId',
+					   title: '项目定义号'
+				   },
+				   {
+					   field: 'task.projectName',
+					   title: '项目名称'
+				   },
 			   {
 			   field: 'procDef.name',
 			   title: '流程名称'
@@ -139,12 +147,15 @@ $(document).ready(function() {
         });
 
 	  $("#search").click("click", function() {// 绑定查询按扭
-		  var val = $("#xmName").val();
-		  console.log(val);
+		  var reserveProjectName = $("#reserveProjectName").val();
+		  var projectId = $("#projectId").val();
+		  var projectName = $("#projectName").val();
 		  $('#actTable').bootstrapTable('refresh',{
 			  query:
 				  {
-					  xmName: val
+					  reserveProjectName: reserveProjectName,
+					  projectId: projectId,
+					  projectName: projectName
 				  }
 		  });
 		});

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.jsp

@@ -40,9 +40,17 @@
 				</form:select>
 			</div>
 			<div class="col-xs-12 col-sm-6 col-md-4">
-				<label class="label-item single-overflow pull-left" title="项目名称">项目名称：</label>
-				<input Class="form-control" id="xmName"/>
+				<label class="label-item single-overflow pull-left" title="储备项目暂定名称">储备项目暂定名称：</label>
+				<input Class="form-control" id="reserveProjectName"/>
 			</div>
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<label class="label-item single-overflow pull-left" title="项目定义">项目定义：</label>
+					<input Class="form-control" id="projectId"/>
+				</div>
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<label class="label-item single-overflow pull-left" title="项目名称">项目名称：</label>
+					<input Class="form-control" id="projectName"/>
+				</div>
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 				 <div class="form-group">
 					<label class="label-item single-overflow pull-left" title="创建时间：">&nbsp;创建时间：</label>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectBasicInformation.js

@@ -229,12 +229,11 @@ $(document).ready(function () {
     });
 
     $("#btnExport").click(function () {
-        jp.downloadFile('${ctx}/sg/managementcenter/project/btnExport', '项目前期基本信息');
-    });
-
-
-    $("#export").click(function () {//导出Excel文件
-        jp.downloadFile('${ctx}/sg/managementcenter/project/export');
+        var id = getIdSelections();
+        var projectId = $("#projectId").val();
+        var reserveProjectName = $("#reserveProjectName").val();
+        var projectName = $("#projectName").val();
+        jp.downloadFile('${ctx}/sg/managementcenter/project/btnExport?id=' + id + '&reserveProjectName=' + reserveProjectName + '&projectId=' + projectId + '&projectName=' + projectName);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭

src/main/webapp/webpage/modules/sg/managementcenter/project/projectBasicInformation.jsp

@@ -25,6 +25,14 @@
 						<form:input path="reserveProjectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
 					</div>
 					<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" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+						<form:input path="projectName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
 						<div style="margin-top:26px">
 							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
@@ -51,11 +59,6 @@
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
 			</shiro:hasPermission>
-<%--			<shiro:hasPermission name="sg:managementcenter:project:export">
-	        		<button id="export" class="btn btn-warning">
-					<i class="fa fa-file-excel-o"></i> 导出
-				</button>
-			</shiro:hasPermission>--%>
 		    </div>
 	<!-- 表格 -->
 	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectDisclosurePlan.js

@@ -197,32 +197,7 @@ $(document).ready(function () {
             }
         });
     });
-    /*$("#btnImportPicking").click(function () {
-        jp.open({
-            type: 2,
-            area: [500, 200],
-            auto: true,
-            title: "导入领料单",
-            content: "${ctx}/tag/importExcel",
-            btn: ['确定', '关闭'],
-            btn1: function (index, layero) {
-                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/project/importPicking', function (data) {
-                    if (data.success) {
-                        jp.success(data.msg);
-                        refresh();
-                    } else {
-                        jp.error(data.msg);
-                    }
-                    jp.close(index);
-                });//调用保存事件
-                return false;
-            },
-            btn2: function (index) {
-                //  jp.close(index);
-            }
-        });
-    });*/
+
 
     $("#export").click(function () {//导出Excel文件
         jp.downloadFile('${ctx}/sg/managementcenter/project/export');