Bladeren bron

储备模块流程变动

lem 4 jaren geleden
bovenliggende
commit
2b0d8d024d
14 gewijzigde bestanden met toevoegingen van 268 en 89 verwijderingen
  1. 1 1
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/MaterialInfoMapper.java
  2. 4 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/xml/MaterialInfoMapper.xml
  3. 10 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/PersonnelTurnoverMapper.java
  4. 9 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ProgressScheduleMapper.java
  5. 28 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/PersonnelTurnoverMapper.xml
  6. 13 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ProgressScheduleMapper.xml
  7. 54 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ProgressScheduleService.java
  8. 8 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveProcessService.java
  9. 1 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/PersonnelTurnoverController.java
  10. 12 0
      src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ProgressScheduleController.java
  11. 35 33
      src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/allUploadList.js
  12. 56 51
      src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/allUploadList.jsp
  13. 29 3
      src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.js
  14. 8 1
      src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.jsp

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/MaterialInfoMapper.java

@@ -20,5 +20,5 @@ public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 	List<MaterialInfo> findByList(@Param("list") List<MaterialProject> list);
 	void deleteByPro(String projectName);
 	void deleteByOld(String projectName);
-
+	void deleteMaterial(String projectName);
 }

+ 4 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/xml/MaterialInfoMapper.xml

@@ -250,4 +250,8 @@
 		</foreach>
 		</where>
 	</select>
+	<delete id="deleteMaterial">
+		delete from xm_material_project
+		where reserveProjectName = #{reserveProjectName}
+	</delete>
 </mapper>

+ 10 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/PersonnelTurnoverMapper.java

@@ -20,6 +20,11 @@ public interface PersonnelTurnoverMapper extends BaseMapper<PersonnelTurnover> {
     PersonnelTurnover findByProjectId(PersonnelTurnover personnelTurnover);
 
     /**
+     * 通过储备项目编号查询人员信息
+     * */
+    PersonnelTurnover findByReserveId(String projectReserveId);
+
+    /**
      * 通过储备项目编号修改开启流程状态
      */
     void updateOpenStatus(@Param("projectReserveId") String projectReserveId,@Param("openProcessStatus")String openProcessStatus);
@@ -39,4 +44,9 @@ public interface PersonnelTurnoverMapper extends BaseMapper<PersonnelTurnover> {
      * 通过项目名称修改储备项目项目规模状态
      */
     void updateAddWareHousingStatus(@Param("projectReserveId") String projectReserveId, @Param("addWareHousing") String addWareHousing);
+
+    /**
+     * 通过项目储备项目编码重置人员信息
+     * */
+    void resetStatus(String projectReserveId);
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ProgressScheduleMapper.java

@@ -22,4 +22,13 @@ public interface ProgressScheduleMapper extends BaseMapper<ProgressSchedule> {
      * */
     ProgressSchedule findProjectReserveId(String projectReserveId);
 
+    /**
+     * 通过储备编码查询项目基础信息
+     */
+    String findStatus(String reserveCode);
+
+    /**
+     * 通过项目储备编码重置项目完成时间
+     * */
+    void resetTime(String projectReserveId);
 }

+ 28 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/PersonnelTurnoverMapper.xml

@@ -84,6 +84,20 @@
         where projectReserveId = #{projectReserveId}
     </select>
 
+    <select id="findByReserveId"
+            resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.PersonnelTurnover">
+        select id,
+               openProcessStatus,
+               addWareHousing,
+               materialsStatus,
+               projectReserveId,
+               designUnit,
+               projectManager,
+               economicPersonnel,
+               operationUnit
+        from cb_personnel_turnover
+        where projectReserveId = #{projectReserveId}
+    </select>
 
     <insert id="insert">
         insert into cb_personnel_turnover (id,
@@ -142,6 +156,20 @@
         update cb_personnel_turnover set addWareHousing =#{addWareHousing}
         where projectReserveId = #{projectReserveId}
     </update>
+    <update id="updateMaterialStatus">
+        update cb_personnel_turnover set materialsStatus =#{materialsStatus}
+        where projectReserveId = #{projectReserveId}
+    </update>
+    <update id="resetStatus">
+        update cb_personnel_turnover
+        set designUnit        = '',
+            projectManager    = '',
+            economicPersonnel = '',
+            operationUnit     = '',
+            openProcessStatus = '0',
+            materialsStatus   = '0'
+        where projectReserveId = #{projectReserveId}
+    </update>
 
 
 </mapper>

+ 13 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ProgressScheduleMapper.xml

@@ -80,6 +80,11 @@
         from cb_progress_schedule
         where projectReserveId = #{projectReserveId}
     </select>
+    <select id="findStatus" resultType="java.lang.String">
+        select status
+        from xm_material_project
+        where reserveCode = #{reserveCode}
+    </select>
 
 
     <insert id="insert">
@@ -164,6 +169,14 @@
         </if>
         where projectReserveId = #{projectReserveId}
     </update>
+    <update id="resetTime">
+        update cb_progress_schedule
+        set designUpload  = '',
+            drawingReview = '',
+            estimate      = '',
+            jointDrawing  = ''
+        where projectReserveId = #{projectReserveId}
+    </update>
 
 
 </mapper>

+ 54 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ProgressScheduleService.java

@@ -6,10 +6,15 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.filing.constructionStage.entity.ProjectSchedule;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.mapper.MaterialInfoMapper;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.PersonnelTurnover;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ProgressSchedule;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.PersonnelTurnoverMapper;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ProgressScheduleMapper;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ReserveProcessMapper;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +32,18 @@ import java.util.Map;
 @Transactional(readOnly = true)
 public class ProgressScheduleService extends CrudService<ProgressScheduleMapper, ProgressSchedule> {
 
+    @Autowired
+    private PersonnelTurnoverMapper turnoverMapper;
+
+    @Autowired
+    private MaterialInfoMapper materialInfoMapper;
+
+    @Autowired
+    private ReserveProcessMapper reserveProcessMapper;
+
+    @Autowired
+    private ProgressScheduleMapper scheduleMapper;
+
 
     @Override
     public ProgressSchedule get(ProgressSchedule entity) {
@@ -71,4 +88,41 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
     public void updateTimeNode(ProgressSchedule entity) {
         mapper.updateTimeNode(entity);
     }
+
+    /**
+     * 通过项目id重置项目
+     * */
+    @Transactional(readOnly = false)
+    public String reset(ProgressSchedule entity){
+        String projectReserveId = entity.getProjectReserveId();
+        String projectName = entity.getProjectName();
+        // 判断项目是否发起了储备项目流程,未发起无需重置
+        PersonnelTurnover byReserveId = turnoverMapper.findByReserveId(projectReserveId);
+        String openProcessStatus = byReserveId.getOpenProcessStatus();
+        if ("0".equals(openProcessStatus)) {
+            return "项目无需重置,未发起储备流程";
+        }
+        //判断项目是否发起施工交底流程,如果发起,不可以重置,
+        String status = mapper.findStatus(projectReserveId);
+        if (null != status && !"0".equals(status)) {
+            return "项目已发起施工交底流程,无法重置";
+        }
+        String addWareHousing = byReserveId.getAddWareHousing();
+        if (!"0".equals(addWareHousing)) {
+            turnoverMapper.updateAddWareHousingStatus(projectReserveId,"3");
+        }
+        // 重置年度物资上报统计/明细,
+        materialInfoMapper.deleteByPro(projectName);
+        materialInfoMapper.deleteMaterial(projectName);
+        // 删除储备流程对应数据,
+        reserveProcessMapper.deleteAct(projectReserveId);
+        // 重置项目流程进度时间,
+        scheduleMapper.resetTime(projectReserveId);
+        // 重置人员流转信息-清空人员流转信息,修改流程开启状态,甲供材清册状态
+        turnoverMapper.resetStatus(projectReserveId);
+        //修改状态入库退回
+        //删除甲供材信息
+        reserveProcessMapper.deleteMaterial(projectName);
+        return "重置成功";
+    }
 }

+ 8 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveProcessService.java

@@ -311,8 +311,16 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
             //审核通过修改项目状态,将物料信息导入年度物资上报统计
             //根据流程定义号查询项目编码
             ReserveManagement byProcInsId = reserveManagementMapper.findByProcInsId(act.getProcInsId());
+            //通过储备编码查询项目的入库状态-如果是0修改为1,如果是3,修改成4
             String projectReserveId = byProcInsId.getProjectReserveId();
             String projectName = byProcInsId.getProjectName();
+            PersonnelTurnover byReserveId = personnelTurnoverMapper.findByReserveId(projectReserveId);
+            String addWareHousing = byReserveId.getAddWareHousing();
+            if ("0".equals(addWareHousing)) {
+                personnelTurnoverMapper.updateAddWareHousingStatus(projectReserveId, "1");
+            } else {
+                personnelTurnoverMapper.updateAddWareHousingStatus(projectReserveId, "4");
+            }
             //修改项目甲供材清册状态
             personnelTurnoverMapper.updateMaterialStatus(projectReserveId, "2");
             //获取所有的物料信息-导入年度物资上报统计

+ 1 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/PersonnelTurnoverController.java

@@ -175,6 +175,7 @@ public class PersonnelTurnoverController extends BaseController {
                     list) {
                 //通过储备项目名称查询项目信息
                 PersonnelTurnover byProjectId = service.findByProjectId(s);
+
                 if (null == byProjectId) {
                     s.preInsert();
                     s.setOpenProcessStatus("1");

+ 12 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ProgressScheduleController.java

@@ -113,4 +113,16 @@ public class ProgressScheduleController extends BaseController {
         return j;
     }
 
+    /**
+     * 通过项目id重置项目
+     * */
+    @ResponseBody
+    @RequestMapping(value = "reset")
+    public AjaxJson reset(ProgressSchedule progressSchedule){
+        AjaxJson j = new AjaxJson();
+        String reset = service.reset(progressSchedule);//重置
+        j.setSuccess(true);
+        j.setMsg(reset);
+        return j;
+    }
 }

+ 35 - 33
src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/allUploadList.js

@@ -74,6 +74,7 @@ $(document).ready(function() {
 					   field: 'budgetStatement',
 					   title: '预算书',
 					   formatter:function(value, row , index){
+						   if (value) {
 						   var valueArray = value.split("|");
 						   var labelArray = [];
 						   for(var i =0 ; i<valueArray.length; i++){
@@ -86,56 +87,57 @@ $(document).ready(function() {
 						   }
 						   return labelArray.join(" ");
 					   }
-
+					   }
 				   }, {
 					   field: 'projectProposal',
 					   title: '项目建议书',
-					   formatter:function(value, row , index){
-						   var valueArray = value.split("|");
-						   var labelArray = [];
-						   for(var i =0 ; i<valueArray.length; i++){
-							   if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-							   {
-								   labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-							   }else{
-								   labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					   formatter:function(value, row , index) {
+						   if (value) {
+							   var valueArray = value.split("|");
+							   var labelArray = [];
+							   for (var i = 0; i < valueArray.length; i++) {
+								   if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i])) {
+									   labelArray[i] = "<a href=\"" + valueArray[i] + "\" url=\"" + valueArray[i] + "\" target=\"_blank\">" + decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/") + 1)) + "</a>"
+								   } else {
+									   labelArray[i] = '<img   onclick="jp.showPic(\'' + valueArray[i] + '\')"' + ' height="50px" src="' + valueArray[i] + '">';
+								   }
 							   }
+							   return labelArray.join(" ");
 						   }
-						   return labelArray.join(" ");
 					   }
-
 				   }, {
 					   field: 'drawings',
 					   title: '图纸',
-					   formatter:function(value, row , index){
-						   var valueArray = value.split("|");
-						   var labelArray = [];
-						   for(var i =0 ; i<valueArray.length; i++){
-							   if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-							   {
-								   labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-							   }else{
-								   labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					   formatter:function(value, row , index) {
+						   if (value) {
+							   var valueArray = value.split("|");
+							   var labelArray = [];
+							   for (var i = 0; i < valueArray.length; i++) {
+								   if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i])) {
+									   labelArray[i] = "<a href=\"" + valueArray[i] + "\" url=\"" + valueArray[i] + "\" target=\"_blank\">" + decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/") + 1)) + "</a>"
+								   } else {
+									   labelArray[i] = '<img   onclick="jp.showPic(\'' + valueArray[i] + '\')"' + ' height="50px" src="' + valueArray[i] + '">';
+								   }
 							   }
+							   return labelArray.join(" ");
 						   }
-						   return labelArray.join(" ");
 					   }
-
 				   }, {
 					   field: 'drawingSpecification',
 					   title: '施工图设计说明书',
-					   formatter:function(value, row , index){
-						   var valueArray = value.split("|");
-						   var labelArray = [];
-						   for(var i =0 ; i<valueArray.length; i++){
-							   if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-							   {
-								   labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-							   }else{
-								   labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					   formatter: function (value, row, index) {
+						   if (value) {
+							   var valueArray = value.split("|");
+							   var labelArray = [];
+							   for (var i = 0; i < valueArray.length; i++) {
+								   if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i])) {
+									   labelArray[i] = "<a href=\"" + valueArray[i] + "\" url=\"" + valueArray[i] + "\" target=\"_blank\">" + decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/") + 1)) + "</a>"
+								   } else {
+									   labelArray[i] = '<img   onclick="jp.showPic(\'' + valueArray[i] + '\')"' + ' height="50px" src="' + valueArray[i] + '">';
+								   }
 							   }
+							   return labelArray.join(" ");
 						   }
-						   return labelArray.join(" ");
 					   }
 				   }
 			   ]

+ 56 - 51
src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/allUploadList.jsp

@@ -1,61 +1,66 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 
 <html>
 <head>
-	<title>储备文件管理</title>
-	<meta name="decorator" content="ani"/>
-	<%@ include file="/webpage/include/bootstraptable.jsp"%>
-	<%@ include file="/webpage/include/treeview.jsp" %>
-	<%@ include file="allUploadList.js"%>
+    <title>储备文件管理</title>
+    <meta name="decorator" content="ani"/>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@ include file="/webpage/include/treeview.jsp" %>
+    <%@ include file="allUploadList.js" %>
 </head>
 <body>
 <div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-		<div class="panel-heading">
-			<h3 class="panel-title">财务项目概预算信息管理</h3>
-		</div>
-		<div class="panel-body">
-
-			<!-- 搜索 -->
-			<div id="search-collapse" class="collapse">
-				<div class="accordion-inner">
-					<form:form id="searchForm" modelAttribute="reserveProcess"
-							   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="projectReserveId" htmlEscape="false" maxlength="64" 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>
-							</div>
-						</div>
-					</form:form>
-				</div>
-			</div>
-
-			<!-- 工具栏 -->
-			<div id="toolbar">
-				<button id="export" class="btn btn-warning">
-					<shiro:hasPermission name="sg:reserve:reserveProcess:export">
-					<i class="fa fa-file-excel-o"></i> 导出甲供材清册
-					</shiro:hasPermission>
-				</button>
-				<button id="exportFiles" class="btn btn-warning">
-					<shiro:hasPermission name="sg:reserve:reserveProcess:export">
-					<i class="fa fa-file-excel-o"></i> 项目导出打包文件
-					</shiro:hasPermission>
-				</button>
-			</div>
-
-			<!-- 表格 -->
-			<table id="testPicTable" style="table-layout:fixed" data-toolbar="#toolbar"></table>
-		</div>
-	</div>
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">财务项目概预算信息管理</h3>
+        </div>
+        <div class="panel-body">
+
+            <!-- 搜索 -->
+            <div id="search-collapse" class="collapse">
+                <div class="accordion-inner">
+                    <form:form id="searchForm" modelAttribute="reserveProcess"
+                               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="projectReserveId" htmlEscape="false" maxlength="64"
+                                        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>
+                            </div>
+                        </div>
+                    </form:form>
+                </div>
+            </div>
+
+            <!-- 工具栏 -->
+            <div id="toolbar">
+
+                <shiro:hasPermission name="sg:reserve:reserveProcess:export">
+                    <button id="export" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 导出甲供材清册
+                    </button>
+                </shiro:hasPermission>
+
+
+                <shiro:hasPermission name="sg:reserve:reserveProcess:export">
+                    <button id="exportFiles" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 项目导出打包文件
+                    </button>
+                </shiro:hasPermission>
+
+            </div>
+
+            <!-- 表格 -->
+            <table id="testPicTable" style="table-layout:fixed" data-toolbar="#toolbar"></table>
+        </div>
+    </div>
 </div>
 </body>
 </html>

+ 29 - 3
src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.js

@@ -1,6 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script >
 $(document).ready(function () {
+    //定义方法---在bootstrap数据循环中使用,必须定义在bootstrapTable之前
     $('#projectTable').bootstrapTable({
         //请求方法
         method: 'post',
@@ -61,6 +62,8 @@ $(document).ready(function () {
         },
         columns:
         [{
+            checkbox: true
+        },{
                 field: 'projectReserveId',
                 title: '项目储备编号'
             },{
@@ -88,6 +91,11 @@ $(document).ready(function () {
         ]
     });
 
+    function operateFormatter(value, row, index) {
+        return [
+            '<input id="TableView" type="button" value="重置项目" class="btn btn-default">',
+        ].join('');
+    }
 
     if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端
         $('#projectTable').bootstrapTable("toggleView");
@@ -95,8 +103,8 @@ $(document).ready(function () {
 
     $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
         'check-all.bs.table uncheck-all.bs.table', function () {
-        $('#remove').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
-        $('#view,#edit,#jlEdit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
+        $('').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
+        $('#view,#edit,#jlEdit,#remove').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
     });
 
     $("#search").click("click", function () {// 绑定查询按扭
@@ -110,9 +118,27 @@ $(document).ready(function () {
         $('#projectTable').bootstrapTable('refresh');
     });
 
-
 });
 
+function getIdSelections() {
+    return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+function deleteAll(){
+    jp.confirm('确认要重置项目吗?', function(){
+        jp.loading();
+        jp.get("${ctx}/sg/managementCenter/progressSchedule/reset?id=" + getIdSelections(), function(data){
+            if(data.success){
+                $('#projectTable').bootstrapTable('refresh');
+                jp.success(data.msg);
+            }else{
+                jp.error(data.msg);
+            }
+        })
+    })
+}
 
 //刷新列表
 function refresh() {

+ 8 - 1
src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/progressScheduleList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>方案交底结论</title>
+	<title>人员流转信息</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -47,6 +47,13 @@
 		</div>
 	
 	<!-- 工具栏 -->
+		<div id="toolbar">
+			<shiro:hasPermission name="sg:reserve:progressSchedule:del">
+				<button id="remove" class="btn btn-danger" onclick="deleteAll()">
+					<i class="glyphicon glyphicon-remove"></i> 重置项目
+				</button>
+			</shiro:hasPermission>
+		</div>
 	<!-- 表格 -->
 	<table id="projectTable" style="table-layout:fixed" class="table" data-toolbar="#toolbar"></table>