Merge branch 'feature-daiban-12-14' into 'developer'

待办以及消息

See merge request !139

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -62,7 +62,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
      */
     private void buildPending(List<PendingTaskDetailDTO> list) {
 
-        String pattern = ".*([0-1]{6}).*";
+        String pattern = ".*([0-9]{6}).*";
         list.forEach(dto -> {
             String title = dto.getTitle();
             PendingTaskTypeEnum taskTypeEnum = PendingTaskTypeEnum.getByType(dto.getTaskType());
@@ -77,7 +77,8 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
                 Pattern r = Pattern.compile(pattern);
                 Matcher matcher = r.matcher(title);
                 String s = matcher.find() ? matcher.group(1) : "";
-                dto.setExtendContent(s);
+                String content = s.substring(0, 4) + "-" + s.substring(4);
+                dto.setExtendContent(content);
             }