From 8f95ccce5bd43aa788b2090ba7081998dda2b8f1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 20:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ------ .../com/adc/da/workFlow/entity/ProcessDetailExport.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index dcddca3d..944b20e2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -641,13 +641,7 @@ public class WorkFlowController { map.put("comment","不同意"); break; 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); exportDatas.add(user); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 1cde1409..0dbc9112 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -16,7 +16,7 @@ public class ProcessDetailExport { @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; @Excel(name = "流程信息", orderNum = "5",width = 15) - private String comment; + private String commentText; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; }