1、删除会议议题表单无用代码

2、修复workflow作废表单无法恢复的功能

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/meetingAgenda/controller/MeetingAgendaController.java

@@ -2,7 +2,6 @@ package com.zjugis.module.business.flow.meetingAgenda.controller;
 
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.workflow.WorkFlow;
-import com.zjugis.module.business.flow.applicationinfo.vo.ApplicationInfoVO;
 import com.zjugis.module.business.flow.meetingAgenda.service.IMeetingAgendaService;
 import com.zjugis.module.business.flow.meetingAgenda.vo.MeetingAgendaVO;
 import org.springframework.web.bind.annotation.*;

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/MeetingAgenda/index.ftl

@@ -70,7 +70,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                </div>
                             </td>
                             <td class="th">
-                                <div class="form-label">汇报时长：</div>
+                                <div class="form-label">汇报时长(分钟)：</div>
                             </td>
                             <td>
                                 <div class="form-group">

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/MeetingAgenda/js/index.js

@@ -4,82 +4,6 @@
         flowInstanceId = z.ui.comm.getUrlParam("flowInstanceId");
         bindEvents();
 
-        z.ui.selecttree("[name='createReqVO$attendees']").init(
-        {
-            view:{
-                defaultOpen:true,
-                iconCls:function(val){
-                    if(val.type==1){
-                        return "z-tree-icon-dep";
-                    }else if(val.type==2){
-                        return "z-tree-icon-person";
-                    }else if(val.type==3){
-                        return "z-tree-icon-worker";
-                    }
-                }
-            },
-            search:{
-                enable:true
-            },
-            check:{
-                enable:true //是否使用选择框
-            },
-            treedata:[
-                {
-                    id:1,//数据id
-                    pid:3,//数据父级id
-                    type:2,
-                    name:'一级别部门1'//显示的文字
-                },
-                {
-                    id:2,
-                    pid:4,
-                    type:2,
-                    name:'二级部门1'
-                },
-                {
-                    id:3,
-                    type:1,
-                    name:'二级部门2'
-                },{
-                    id:4,
-                    type:1,
-                    name:'一级别部门2'
-                },
-                {
-                    id:5,
-                    pid:4,
-                    type:1,
-                    name:'二级部门3'
-                },
-                {
-                    id:6,
-                    type:1,
-                    name:'二级部门4',
-                    children:[
-                        {
-                            id:8,
-                            pid:1,
-                            type:3,
-                            name:'二级部门14'
-                        },
-                        {
-                            id:9,
-                            pid:1,
-                            type:3,
-                            name:'二级部门24'
-                        }
-                    ]
-                },
-                {
-                    id:7,
-                    pid:1,
-                    type:3,
-                    name:'二级部门9'
-                }
-            ]
-        });
-
     };
 
     function bindEvents() {
@@ -101,11 +25,10 @@
             }
         }
 
-        postData.createReqVO.attendees = postData.createReqVO.attendees.join(",")
         console.log(JSON.stringify(postData.createReqVO))
         z.ui.ajax({
             type: "post",
-            url: "/meetingNotice/update",
+            url: "/meetingAgenda/update",
             data: JSON.stringify(postData.createReqVO),
 
             contentType: "application/json",

zjugis-workflow/src/main/resources/templates/HandlerCaseCenter/js/config.js

@@ -669,7 +669,8 @@
 				height: 400, width: 800,
 				data: {
 					voidFlowInstanceId: rowData.FLOWINSID,
-					activityInstanceId: rowData.ACTIVITYINSID,
+//					activityInstanceId: rowData.ACTIVITYINSID,
+					activityInstanceId: rowData.nullyId,
 					isRecover: 1
 				}
 			});