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 2dd91c46..36a98550 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 @@ -524,13 +524,22 @@ public class WorkFlowController { map.put("flag","未完成"); } if(map.get("comment")!=null && !map.get("comment").toString().equals("")){ - if(map.get("comment").toString().equals("0")){ - map.put("comment","同意"); - }else if(map.get("comment").toString().equals("1")){ - map.put("comment","不同意"); - }else{ - map.put("comment",map.get("commentText").toString()); + String comment = map.get("comment").toString(); + switch (comment){ + case "0": + map.put("comment","同意"); + break; + case "1": + 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);