Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2005,14 +2005,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 String taskDefKey = (String) flowableRecordVo.get("taskDefKey");
                 List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
                 String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
-                Date finishTime = (Date) flowableRecordVo.get("finishTime");
-                String spsj = DateUtil.formatDate(finishTime);
+                String finishTime = (String) flowableRecordVo.get("finishTime");
+                finishTime = finishTime.substring(0,10);
                 if ("Activity_1x1eivz".equals(taskDefKey)){
-                    dataMap.put("makeName", assigneeName + spsj);
+                    dataMap.put("makeName", assigneeName + finishTime);
                 }else if ("Activity_13w5v5m".equals(taskDefKey)){
-                    dataMap.put("jrsp", assigneeName + spsj);
+                    dataMap.put("jrsp", assigneeName + finishTime);
                 }else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)){
-                    dataMap.put("confirmName", assigneeName + spsj);
+                    dataMap.put("confirmName", assigneeName + finishTime);
                 }
             }
         }