Pārlūkot izejas kodu

将原用印申请驳回后,修改重新提交申请的显示多条重复流信息bug进行修改

user5 5 gadi atpakaļ
vecāks
revīzija
d1e7659f4d

+ 21 - 1
src/main/java/com/jeeplus/modules/workadministrativeatamp/web/WorkAdministrativeAtampController.java

@@ -49,6 +49,8 @@ import java.util.List;
 @Controller
 @RequestMapping(value = "${adminPath}/workadministrativeatamp/workAdministrativeAtamp")
 public class WorkAdministrativeAtampController extends BaseController {
+    @Autowired
+    private HttpServletRequest request;
 
 	@Autowired
 	private WorkAdministrativeAtampService workAdministrativeAtampService;
@@ -102,8 +104,26 @@ public class WorkAdministrativeAtampController extends BaseController {
         if(workAdministrativeAtamp.getOffice()==null||StringUtils.isBlank(workAdministrativeAtamp.getOffice().getId())){
 	        workAdministrativeAtamp.setOffice(UserUtils.getSelectOffice());
         }
+        String view = "workAdministrativeAtampForm";
+        String tabId = request.getParameter("tabId");
 		model.addAttribute("workAdministrativeAtamp", workAdministrativeAtamp);
-		return "modules/workadministrativeatamp/workAdministrativeAtampForm";
+        if("3".equals(tabId)){
+            ProcessInstance processInstance = actTaskService.getProcIns(workAdministrativeAtamp.getProcessInstanceId());
+            if (processInstance!=null) {
+                Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
+                Act act = new Act();
+                act.setTaskId(taskInfok.getId());
+                act.setTaskName(taskInfok.getName());
+                act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                act.setProcDefId(taskInfok.getProcessDefinitionId());
+                act.setProcInsId(taskInfok.getProcessInstanceId());
+                act.setTask(taskInfok);
+                workAdministrativeAtamp.setAct(act);
+                view = "workAdministrativeAtampModifyApply";
+            }
+        }
+        return "modules/workadministrativeatamp/"+view;
+		//return "modules/workadministrativeatamp/workAdministrativeAtampForm";
 	}
 
 	/**

+ 1 - 1
src/main/webapp/webpage/modules/workadministrativeatamp/workAdministrativeAtampList.jsp

@@ -307,7 +307,7 @@
                                 xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
                             }
                             if(d.canmodify != undefined && d.canmodify =="1"){
-                                xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id + "&tabId=3','95%','95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                             }
                             if(d.canrecall != undefined && d.canrecall =="1"){
                                 xml+="<a href=\"#\" onclick=\"openDialogre('修改用印申请', '${ctx}/workadministrativeatamp/workAdministrativeAtamp/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";

+ 2 - 2
src/main/webapp/webpage/modules/workadministrativeatamp/workAdministrativeAtampModifyApply.jsp

@@ -113,7 +113,7 @@
                                 <%--<input type="text" name="title" lay-verify="title" autocomplete="off" readonly="true" placeholder="" class="layui-input" value="全过程管理用户01">--%>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6">
+                    <div class="layui-item layui-col-sm6 td1">
                         <label class="layui-form-label"><span class="require-item">*</span>项目名称:</label>
                         <div class="layui-input-block  with-icon">
                             <input type="hidden" value="" id ="ids">
@@ -121,7 +121,7 @@
                                                         labelValue="${workAdministrativeAtamp.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6">
+                    <div class="layui-item layui-col-sm6 td1">
                         <label class="layui-form-label"><span class="require-item">*</span>项目编号:</label>
                         <div class="layui-input-block">
                             <form:input id ="pNumber" path="project.projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>