选择项目自动分发流程

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

@@ -6,6 +6,7 @@ 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.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 
 /**
@@ -18,4 +19,8 @@ import com.jeeplus.modules.test.activiti.entity.OALeave;
 public interface ConstructionMapper extends BaseMapper<Construction> {
 
     int newUpdate(Construction construction);
+
+    User queryPerson(String loginName);
+
+    void newSave(Construction construction);
 }

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

@@ -213,4 +213,42 @@
 		select * FROM xm_construction_clarificaiton  where ${propertyName} = '${value}'
 	</select>
 
+	<select id="queryPerson" resultType="com.jeeplus.modules.sys.entity.User">
+		SELECT	* FROM sys_user where login_name = #{loginName}
+	</select>
+
+
+	<insert id="newSave">
+		INSERT INTO xm_construction_clarificaiton(
+			id,
+			proc_ins_id,
+			user_name,
+			project_id,
+			project_name,
+			accept_date,
+			examine_date,
+			applyName,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{procInsId},
+			#{userName},
+			#{projectId},
+			#{projectName},
+			#{acceptDate},
+			#{examineDate},
+			#{applyName},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
 </mapper>

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

@@ -7,6 +7,7 @@ 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.mapper.ConstructionMapper;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.test.activiti.entity.OALeave;
 import com.jeeplus.modules.test.activiti.mapper.OALeaveMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,14 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		constructionMapper.newUpdate(construction);
 	}
 
+	public User queryPerson(String loginName) {
+		return constructionMapper.queryPerson(loginName);
+	}
 
+	@Transactional(readOnly = false)
+	public void newSave(Construction construction) {
+		construction.preInsert();
+		constructionMapper.newSave(construction);
+	}
 
 }

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

@@ -3,7 +3,9 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 import com.jeeplus.modules.sys.entity.Office;
-import java.util.Date;
+
+import java.util.*;
+
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.core.persistence.Page;
@@ -55,9 +57,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 施工交底Controller
@@ -166,97 +165,103 @@ public class ConstructionController extends BaseController {
             j.setMsg(errMsg);
             return j;
         }
-        Project project = new Project();
         /**
          * 流程审批
          */
 
-        if (StringUtils.isBlank(construction.getId())) {
-            //新增或编辑表单保存
-            for (int i = 0; i <2; i++) {
-                Map<String, Object> vars = Maps.newHashMap();
-                if (i == 0) {
-                    vars.put("company", true);
-                    vars.put("manager", false);
+    if (StringUtils.isBlank(construction.getId())) {
+        //用于记录未发起的流程原因
+        String info = "";
+        //用户修改发起流程后的项目状态
+        Project newProject = new Project();
+        //定义vars用于指派流程走向
+        Map<String, Object> vars = Maps.newHashMap();
+        //获取选择的项目信息id
+        String projectId = construction.getProjectId();
+        //项目施工单位字段定义
+        String constructionUnit = "";
+        //定义施工单位角色
+        String constructionUnitRole = "";
+        //定义项目经理角色
+        String projectManageRole = "";
+        //根据，分割得到选择项目的id数组
+        String[] proListId = projectId.split(",");
+        //根据数组查询得到项目信息
+        List<Project> listById = projectService.findListById(proListId);
+        //循环项目信息
+            for (Project each : listById) {
+                //从项目信息种获取施工单位字段
+                constructionUnit = each.getClarificaitonType();
+                //如果施工单位不为空，系统判读施工单位交底
+                if ("施工单位自行交底".equals(constructionUnit)) {
+                    //施工单位交底
+                    //获取施工单位角色
+                    constructionUnitRole = each.getConstructionUnitRole();
+                    //查询是否有此登录名用户
+                    User user = constructionService.queryPerson(constructionUnitRole);
+                    //如果查询不为空表示有用户，为空没有此用户
+                    if (user != null) {
+                        //有此用户-施工单位交底
+                        vars.put("company", true);
+                        vars.put("manager", false);
+                        vars.put("processer", constructionUnitRole);
+                        String id = each.getId();
+                        construction.setApplyName(constructionUnitRole);
+                        construction.setProjectId(id);
+                        construction.setProjectName(each.getRequireName());
+                        constructionService.newSave(construction);//保存
+                        newProject.setStatus("1");
+                        newProject.setProjectId(id);
+                        projectService.updateStatus(newProject);
+                        String procDefKey = construction.getAct().getProcDefKey();
+                        // 启动流程
+                        ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+                        String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                        actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
+                    } else {
+                        //没有此用户
+                        info += ("项目："+each.getRequireName()+"没有此施工单位人员，请核实。");
+                        continue;
+                    }
                 } else {
-                    vars.put("company", false);
-                    vars.put("manager", true);
+                    //项目经理交底
+                    //获取项目经理角色
+                    projectManageRole = each.getProjectManageRole();
+                    //查询是否有此登录名用户
+                    User user = constructionService.queryPerson(projectManageRole);
+                    //查询是否有此用户
+                    if (user != null) {
+                        //有此用户
+                        vars.put("company", false);
+                        vars.put("manager", true);
+                        vars.put("processer", projectManageRole);
+                        String id = each.getId();
+                        construction.setApplyName(projectManageRole);
+                        construction.setProjectId(id);
+                        construction.setProjectName(each.getRequireName());
+                        constructionService.newSave(construction);//保存
+                        newProject.setStatus("1");
+                        newProject.setProjectId(id);
+                        projectService.updateStatus(newProject);
+                        String procDefKey = construction.getAct().getProcDefKey();
+                        // 启动流程
+                        ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+                        String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                        actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
+                    } else {
+                        //没有此用户
+                        info += ("项目："+each.getRequireName()+"没有此项目经理，请核实。");
+                        continue;
+                    }
                 }
-                construction.setApplyName(construction.getTuser().getName());
-                constructionService.save(construction);//保存
-                project.setStatus("1");
-                project.setRequireName(construction.getProjectName());
-                projectService.updateStatus(project);
-                String procDefKey = construction.getAct().getProcDefKey();
-                // 启动流程
-                ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
-                vars.put("processer", UserUtils.get(construction.getTuser().getId()).getLoginName());
-                String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
             }
-            j.setMsg("发起流程审批成功!");
+            //新增或编辑表单保存
+            j.setMsg("发起流程审批成功!"+info);
             j.getBody().put("targetUrl", "/act/task/process/");
         }
         return j;
     }
 
-    /**
-     * 导入图纸审核信息
-     */
-//    @RequiresPermissions("modules:sg:information:information:import")
-    @ResponseBody
-    @RequestMapping(value = "drawingReview")
-    public AjaxJson drawingReview(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String id) {
-        AjaxJson j = new AjaxJson();
-        try {
-            int successNum = 0;
-            int failureNum = 0;
-            StringBuilder failureMsg = new StringBuilder();
-            ImportExcel ei = new ImportExcel(file, 1, 0);
-            int lastDataRowNum = ei.getLastDataRowNum();
-            Construction construction = new Construction();
-            for (int i = 1; i < lastDataRowNum; i++) {
-                Row row = ei.getRow(i);
-                construction.setId(id);
-                construction.setPowerLine(ei.getCellValue(row, 0 ).toString());
-                construction.setBlackoutArea(ei.getCellValue(row, 1 ).toString());
-                construction.setProjectType(ei.getCellValue(row, 2 ).toString());
-                construction.setPowerFailure(ei.getCellValue(row, 3 ).toString());
-                construction.setPreliminaryJudgment(ei.getCellValue(row, 4 ).toString());
-                construction.setCivilEngineering(ei.getCellValue(row, 5 ).toString());
-                construction.setBaseType(ei.getCellValue(row, 6 ).toString());
-                construction.setPlanApproval(ei.getCellValue(row, 7 ).toString());
-                construction.setTransformationType(ei.getCellValue(row, 8 ).toString());
-                construction.setTransformationEquipment(ei.getCellValue(row, 9 ).toString());
-                construction.setNewNamed(ei.getCellValue(row, 10).toString());
-                construction.setPutInto(ei.getCellValue(row, 11).toString());
-                construction.setElectricalConstruction(ei.getCellValue(row, 12).toString());
-                construction.setTheAssignment(ei.getCellValue(row, 13).toString());
-                construction.setAutomation(ei.getCellValue(row, 14).toString());
-                construction.setRemote(ei.getCellValue(row, 15).toString());
-                construction.setCommunicationMode(ei.getCellValue(row, 16).toString());
-                construction.setInSitu(ei.getCellValue(row, 17).toString());
-                construction.setNetworkCabinet(ei.getCellValue(row, 18).toString());
-                construction.setStation(ei.getCellValue(row, 19).toString());
-            }
-            try {
-                constructionService.newUpdate(construction);
-                successNum++;
-            } catch (ConstraintViolationException ex) {
-                failureNum++;
-            } catch (Exception ex) {
-                failureNum++;
-            }
-            if (failureNum > 0) {
-                failureMsg.insert(0, "，失败 " + failureNum + " 条票务代理记录。");
-            }
-            j.setMsg("已成功导入 " + successNum + " 条票务代理记录" + failureMsg);
-        } catch (Exception e) {
-            j.setSuccess(false);
-            j.setMsg("导入票务代理失败！失败信息：" + e.getMessage());
-        }
-        return j;
-    }
 
 
 }

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

@@ -7,6 +7,8 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 
+import java.util.List;
+
 /**
  * 请假表单MAPPER接口
  * @author lgf
@@ -16,4 +18,6 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 public interface ProjectMapper extends BaseMapper<Project> {
 
     public void updateStatus(Project project);
+
+    public List<Project> findListById(String[] proListId);
 }

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

@@ -253,4 +253,16 @@
 	<update id="updateStatus">
 		update xm_project_details set status = #{status} where id = #{id};
 	</update>
+
+
+	<select id="findListById" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+		SELECT
+		<include refid="projectColumns"/>
+		FROM xm_project_details a
+		where a.id	in
+		<foreach collection="array" item="id" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+	</select>
+
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -52,4 +52,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	    projectMapper.updateStatus(project);
     }
 
+	public List<Project> findListById(String[] proListId) {
+		return projectMapper.findListById(proListId);
+	}
+
 }

src/main/java/com/jeeplus/modules/sys/mapper/xml/UserMapper.xml

@@ -144,19 +144,18 @@
 					<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
 					<if test="dbName == 'mssql'">'%'+#{office.id}+'%')</if>
 		</if>
-		<if  test="roleList !=null and roleList!= ''">
+<!--		<if  test="roleList !=null and roleList!= ''">
 			and a.id in
-			(
-			select user_id from sys_user_role where role_id in
-			(
-			select id from sys_role where name
-			in
-			<foreach collection="roleList" item="item" index="index" open="(" separator="," close=")">
-				#{item.name}
-			</foreach>
-			)
-			)
-		</if>
+				(
+					select user_id from sys_user_role where role_id in
+					(
+						select id from sys_role where name	in
+							<foreach collection="roleList" item="item" index="index" open="(" separator="," close=")">
+								#{item.name}
+							</foreach>
+					)
+				)
+		</if>-->
 		<!-- 如果不是超级管理员，则不显示超级管理员用户 -->
 		<if test="!currentUser.admin">
 			AND a.id != '1'
@@ -220,7 +219,6 @@
 		${dataScope}
 		<!-- 排序 -->
 		ORDER BY  a.name
-	
 	</select>
 	
 	<!-- 根据OfficeId获取用户（树查询用户时用） -->

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -181,67 +181,67 @@ public class OfficeController extends BaseController {
 			@RequestParam(required=false) Long grade, @RequestParam(required=false) Boolean isAll, HttpServletResponse response) {
 
 		List<Map<String, Object>> mapList = Lists.newArrayList();
-		List<Office> offices = officeService.findList(isAll);
-		List<Office> list = new ArrayList<Office>();
-		List<String> strings = new ArrayList<String>();//存放父类id
-		List<String> strings1 = new ArrayList<String>();//存放父类id
+		List<Office> list = officeService.findList(isAll);
+//		List<Office> list = new ArrayList<Office>();
+//		List<String> strings = new ArrayList<String>();//存放父类id
+//		List<String> strings1 = new ArrayList<String>();//存放父类id
 		//获取字符串
-		User user = new User();
-		Boolean flag = false;
-		String[] sts = {};//字符串数组
-		String str = "";
-		try {
-			roleNeedName = URLDecoder.decode(roleNeedName, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		String[] split = roleNeedName.split(";");
-		if (split != null && split.length > 0) {
-			Role role = null;
-			List<Role> roles = new ArrayList<>();
-			for (int i = 0; i < split.length; i++) {
-				role = new Role();
-				role.setName(split[i]);
-				roles.add(role);
-			}
-			user.setRoleList(roles);
-		}
-		List<User> users = systemService.findUser(user);
-		for (Office office:offices){
-			flag = false;
-			for (User user1:users){
-				if (user1.getOffice().getId().equals(office.getId())){
-					flag = true;
-					break;
-				}
-			}
-			if (flag){
-				str = office.getParentIds();//得到父类节点
-				sts = str.split(",");//节点id截取
-				if (null!=sts&&sts.length>0){
-					for (String string:sts){
-						strings.add(string);
-						strings.add(office.getId());
-					}
-				}
-			}
-		}
-		//去重
-		Set<String> set = new HashSet<String>();
-		for (String string :strings){
-			if (set.add(string)){
-				strings1.add(string);
-			}
-		}
-		//得到最终的offic集合
-		for (String string:strings1){
-			for (Office office:offices){
-				if (string.equals(office.getId())){
-					list.add(office);
-					break;
-				}
-			}
-		}
+//		User user = new User();
+//		Boolean flag = false;
+//		String[] sts = {};//字符串数组
+//		String str = "";
+//		try {
+//			roleNeedName = URLDecoder.decode(roleNeedName, "UTF-8");
+//		} catch (UnsupportedEncodingException e) {
+//			e.printStackTrace();
+//		}
+//		String[] split = roleNeedName.split(";");
+//		if (split != null && split.length > 0) {
+//			Role role = null;
+//			List<Role> roles = new ArrayList<>();
+//			for (int i = 0; i < split.length; i++) {
+//				role = new Role();
+//				role.setName(split[i]);
+//				roles.add(role);
+//			}
+//			user.setRoleList(roles);
+//		}
+//		List<User> users = systemService.findUser(user);
+//		for (Office office:offices){
+//			flag = false;
+//			for (User user1:users){
+//				if (user1.getOffice().getId().equals(office.getId())){
+//					flag = true;
+//					break;
+//				}
+//			}
+//			if (flag){
+//				str = office.getParentIds();//得到父类节点
+//				sts = str.split(",");//节点id截取
+//				if (null!=sts&&sts.length>0){
+//					for (String string:sts){
+//						strings.add(string);
+//						strings.add(office.getId());
+//					}
+//				}
+//			}
+//		}
+//		//去重
+//		Set<String> set = new HashSet<String>();
+//		for (String string :strings){
+//			if (set.add(string)){
+//				strings1.add(string);
+//			}
+//		}
+//		//得到最终的offic集合
+//		for (String string:strings1){
+//			for (Office office:offices){
+//				if (string.equals(office.getId())){
+//					list.add(office);
+//					break;
+//				}
+//			}
+//		}
 
 		HashSet existIds = new HashSet();
 		for(Office o : list){

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -103,24 +103,13 @@ public class UserController extends BaseController {
     @RequiresPermissions("sys:user:index")
     @ResponseBody
     @RequestMapping(value = {"list", ""})
-    public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model, String roleNeedName) {
-
-        String[] split = roleNeedName.split(";");
-        if (split != null && split.length > 0) {
-            Role role = null;
-            List<Role> roles = new ArrayList<>();
-            for (int i = 0; i < split.length; i++) {
-                role = new Role();
-                role.setName(split[i]);
-                roles.add(role);
-            }
-            user.setRoleList(roles);
-        }
+    public Map<String, Object> list(User user, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<User> page = systemService.findUser(new Page<User>(request, response), user);
         return getBootstrapData(page);
     }
 
 
+
     @RequiresPermissions(value = {"sys:user:view", "sys:user:add", "sys:user:edit"}, logical = Logical.OR)
     @RequestMapping(value = "form")
     public String form(User user, Model model) {

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

@@ -6,22 +6,14 @@
 	$(document).ready(function() {
 		jp.ajaxForm("#inputForm",function(data){
 			if(data.success){
-				jp.success(data.msg);
+				jp.alert(data.msg);
 				jp.go("${ctx}"+ data.body.targetUrl);
 			}else{
-				jp.error(data.msg);
+				jp.alert(data.msg);
 				$("#inputForm").find("button:submit").button("reset");
 			}
 		});
 
-		$("#agree").click(function () {
-			var tuser = $("#tuserName").val();
-			console.log(tuser);
-			if (tuser=="") {
-				jp.error("请选择用户");
-				return;
-			}
-		})
 
 		$('#acceptDate').datetimepicker({
 			format: "YYYY-MM-DD HH:mm:ss"

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

@@ -34,7 +34,7 @@
 						</div>
 						<table class="table table-bordered">
 							<tbody>
-							<tr>
+	<%--						<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
 								<td class="width-35">
 									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
@@ -44,7 +44,7 @@
 									<sys:userselect roleName="项目经理;" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.applyName}"
 													cssClass="form-control required"/>
 								</td>
-							</tr>
+							</tr>--%>
 							<tr>
 <%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目号：</label></td>
 								<td class="width-35">
@@ -56,14 +56,14 @@
 									<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="id|requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="true"></sys:itemselect>
 								</td>
-								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
-								<td class="width-35">
-									<div class='input-group form_datetime' id='acceptDate'>
+<%--								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+								<td class="width-35">--%>
+<%--									<div class='input-group form_datetime' id='acceptDate'>
 										<input type='text'  name="acceptDate" class="form-control required"  value="<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
 										<span class="input-group-addon">
 																<span class="glyphicon glyphicon-calendar"></span>
 																 </span>
-									</div>
+									</div>--%>
 								</td>
 							</tr>
 							<tr>
@@ -76,28 +76,20 @@
 			                   		 </span>
 									</div>
 								</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">
 									<textarea  name="examineDate" style="height: 100px" class="form-control">${construction.examineDate}</textarea>
 								</td>
 								<td class="width-15 active"><label class="pull-right"></label></td>
 								<td class="width-35">
-<%--									<textarea  name="examineDate" style="height: 100px" class="form-control">${construction.examineDate}</textarea>--%>
-								</td>
+&lt;%&ndash;									<textarea  name="examineDate" style="height: 100px" class="form-control">${construction.examineDate}</textarea>&ndash;%&gt;
+								</td>--%>
 							</tr>
 							</tbody>
 						</table>
 
 						<div class="form-group">
 							<div class="col-lg-3"></div>
-							<c:if test="${construction.act.taskDefKey ne '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
-								<div class="col-sm-6">
-									<div class="form-group text-center">
-										<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="重新提交" onclick="$('#flag').val('yes')"/>&nbsp;
-										<input id="reject" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="销毁申请" onclick="$('#flag').val('no')"/>&nbsp;
-									</div>
-								</div>
-							</c:if>
 							<c:if test="${construction.act.startTask}">
 								<div class="col-lg-6">
 									<div class="form-group text-center">