归档批次问题修改

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -52,9 +52,11 @@ import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -632,7 +634,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
      * @throws Exception
      */
     @Transactional(readOnly = false)
-    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers) throws Exception {
+    public String auditSave(ProjectFilingBatch projectFilingBatch, List<User> auditUsers,String[] proInfos, String[] flags) throws Exception {
         this.queryInfo(projectFilingBatch);
         Integer filingStatus = projectFilingBatch.getFilingStatus();
         String taskDefKey = projectFilingBatch.getAct().getTaskDefKey();
@@ -645,8 +647,6 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             for (int i=0;i<proId.length;i++) {
                 proId[i]=projectFilingBatches.get(i).getProjectId();
             }
-            String[] proInfos=null;
-            String[] flags=null;
             saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL,proInfos,flags);
         }
 

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -480,7 +480,7 @@ public class ProjectFilingBatchController extends BaseController {
                     return "redirect:"+Global.getAdminPath()+"/projectFilingBatch/projectFilingBatchInfo/?repage";
                 }
 
-                String str = projectFilingBatchService.auditSave(projectFilingBatch,users);
+                String str = projectFilingBatchService.auditSave(projectFilingBatch,users,proInfos,flags);
                 addMessage(redirectAttributes, str);
                 //新增项目树形信息
                 if (proInfos!=null) {

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -465,7 +465,7 @@
                     }
                     if(d.status == 4){
                         //驳回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                     }
                     if(d.status == 1 || d.status == 3 || d.status == 4){
                         xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";