待办-今日待办

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

@@ -64,6 +64,15 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         String endDate = yyyyMMdd + " 23:59:59";
         List<PendingTaskBO> todayPending = pendingTaskService.listPendingTaskByCreateTime(enterpriseId, storeId, clerkId, startDate, endDate);
         List<PendingTaskDetailDTO> retList = EntityUtil.changeEntityListByJSON(PendingTaskDetailDTO.class, todayPending);
+        if (CollectionUtils.isEmpty(retList)) {
+            return ServiceResponse.success(retList);
+        }
+        retList.forEach(dto -> {
+            String title = dto.getTitle();
+            PendingTaskTypeEnum taskTypeEnum = PendingTaskTypeEnum.getByType(dto.getTaskType());
+            dto.setDescription(taskTypeEnum.getDescription().replace("{}", title));
+            dto.setTitle(taskTypeEnum.getName());
+        });
         return ServiceResponse.success(retList);
     }
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -60,7 +60,7 @@
                    timeout="10000"/>
 
     <dubbo:service interface="com.gic.haoban.manage.api.service.notify.PendingTaskApiService"
-                   ref="PendingTaskApiServiceImpl"
+                   ref="pendingTaskApiServiceImpl"
                    timeout="10000"/>
 
     <dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="gicDepartmentService"/>

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -261,15 +261,16 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_pending_task
-        where enterprise_id = #{enterpriseId} and store_id =#{storeId}
-        <if test="clerkId != -1">
+        where enterprise_id = #{enterpriseId}
+        and store_id =#{storeId}
+        <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
         <if test="startDate != null">
-            and create_time >= #{startDate}
+            and create_time <![CDATA[ >= ]]> #{startDate}
         </if>
         <if test="endDate != null">
-            and create_time<= #{endDate}
+            and create_time <![CDATA[ <= ]]> #{endDate}
         </if>
         order by create_time desc limit 20
     </select>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/PendingListQO.java

@@ -3,13 +3,14 @@ package com.gic.haoban.manage.web.qo;
 import com.gic.commons.web.qo.PageQo;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 /**
  * Created 2021/12/16.
  *
  * @author hua
  */
-public class PendingListQO extends PageQo {
+public class PendingListQO extends PageQo implements Serializable {
     /**
      * 企业id
      */