|
|
@@ -6,11 +6,7 @@ import java.io.FileOutputStream;
|
|
|
import java.io.InputStream;
|
|
|
import java.io.OutputStream;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.imageio.ImageIO;
|
|
|
@@ -305,9 +301,9 @@ public class ActivitiService {
|
|
|
}
|
|
|
//按节点名称查询。可按条件判断是否需要过滤掉集中评审
|
|
|
//不获取集中评审的待办任务 select distinct NAME_ from ACT_RU_TASK;
|
|
|
- List<String> allTaskNameExceptConcentrate = Arrays.asList("二级单位分办", "二级单位初审", "二级单位复审", "二级单位审核",
|
|
|
+ List<String> allTaskNameExceptConcentrate = Arrays.asList("准入申请", "年审申请", "增项申请", "变更申请", "日常评价", "二级单位分办", "二级单位初审", "二级单位复审", "二级单位审核",
|
|
|
"业务处室接收", "业务处室专业审批", "专业审批", "专业处室分办", "交费", "企管法规处入库", "企管法规处审批", "企业法规处审批",
|
|
|
- "企管法规处审核", "企管法规处编号、入库", "审批未通过", "审核未通过", "待开发票");
|
|
|
+ "企业法规处审核", "企管法规处审核", "企管法规处编号、入库", "审批未通过", "审核未通过", "待开发票");
|
|
|
taskQuery = taskQuery.taskNameIn(allTaskNameExceptConcentrate);
|
|
|
long taskTotal = taskQuery.count();
|
|
|
|
|
|
@@ -543,6 +539,7 @@ public class ActivitiService {
|
|
|
.executionId(histTask.getExecutionId())
|
|
|
.list();
|
|
|
|
|
|
+ Collections.reverse(varListTmp);
|
|
|
for(HistoricVariableInstance hvi : varListTmp){
|
|
|
if(hvi.getVariableName().equals("businessKey")) {
|
|
|
historicTask.setBusinessKey(hvi.getValue().toString());
|