FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程历史导出

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-29 20:40:16 +08:00
parent e2c70d68f8
commit 8f95ccce5b
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
-6
View File
@@ -641,13 +641,7 @@ public class WorkFlowController {
map.put("comment","不同意"); map.put("comment","不同意");
break; break;
default: default:
String commentText="";
map.put("comment",comment+map.get("commentText"));
} }
}else if (map.get("commentText")!=null && !"".equals(map.get("commentText"))){
map.put("comment",map.get("commentText").toString());
} }
ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class); ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class);
exportDatas.add(user); exportDatas.add(user);
adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class ProcessDetailExport {
@Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15)
private Date endTime; private Date endTime;
@Excel(name = "流程信息", orderNum = "5",width = 15) @Excel(name = "流程信息", orderNum = "5",width = 15)
private String comment; private String commentText;
@Excel(name = "状态", orderNum = "6",width = 15) @Excel(name = "状态", orderNum = "6",width = 15)
private String flag; private String flag;
} }