待办以及消息

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/dto/PendingTaskDetailDTO.java

@@ -67,12 +67,24 @@ public class PendingTaskDetailDTO implements Serializable {
      * 创建时间
      */
     private Date createTime;
+    /**
+     * 月指标的时候传入
+     */
+    private String extendContent;
 
 
     /**
      */
     private static final long serialVersionUID = 1L;
 
+    public String getExtendContent() {
+        return extendContent;
+    }
+
+    public void setExtendContent(String extendContent) {
+        this.extendContent = extendContent;
+    }
+
     public Integer getFinishFlag() {
         return finishFlag;
     }

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

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Created 2021/12/16.
@@ -52,7 +54,14 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         return ServiceResponse.success(retPage);
     }
 
+    /**
+     * 组装
+     *
+     * @param list
+     */
     private void buildPending(List<PendingTaskDetailDTO> list) {
+
+        String pattern = ".*([0-1]{6}).*";
         list.forEach(dto -> {
             String title = dto.getTitle();
             PendingTaskTypeEnum taskTypeEnum = PendingTaskTypeEnum.getByType(dto.getTaskType());
@@ -62,6 +71,15 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
             dto.setDescription(taskTypeEnum.getDescription().replace("{}", title));
             dto.setStatusFlag(dto.getOverdueFlag() == 1 ? PendingStatusFlagEnum.OVERDUE.getType() : PendingStatusFlagEnum.NORMAL.getType());
             dto.setTitle(taskTypeEnum.getName());
+
+            if (dto.getTaskType() == PendingTaskTypeEnum.PERFORMANCE.getType()) {
+                Pattern r = Pattern.compile(pattern);
+                Matcher matcher = r.matcher(title);
+                String s = matcher.find() ? matcher.group(1) : "";
+                dto.setExtendContent(s);
+            }
+
+
         });
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java

@@ -2,8 +2,10 @@ package com.gic.haoban.manage.web.controller;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.notify.dto.PendingTaskDetailDTO;
 import com.gic.haoban.manage.api.dto.notify.qdto.PendingListQDTO;
 import com.gic.haoban.manage.api.enums.PendingTaskTypeEnum;
@@ -48,7 +50,9 @@ public class NotifyController extends WebBaseController {
             pendingListQDTO.setOverdueFlag(1);
         }
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
-        return resultResponse(HaoBanErrCode.ERR_1, retPage.getResult());
+
+        PageResult2 pageInfo = PageUtil.getPageInfo(retPage.getResult());
+        return resultResponse(HaoBanErrCode.ERR_1, pageInfo);
     }
 
     /**