Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

biz-base/src/main/java/com/dayou/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.dayou.controller;
 
+import com.dayou.annotation.DataPermission;
 import com.dayou.annotation.OperLog;
 import com.dayou.bo.PrivilegeTreeBO;
 import com.dayou.condition.LoginCondition;
@@ -34,6 +35,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import static com.dayou.common.Constants.FINANCE_DEPARTMENT;
+import static com.dayou.common.Constants.MANAGER_OFFICE;
 import static com.dayou.constants.JwtConstants.REST_TOKEN;
 
 /**
@@ -52,6 +55,7 @@ public class UserController extends BaseController {
     /**
     * 基础用户列表 部门
     */
+    @DataPermission(department=true,ignoreDepartment = {MANAGER_OFFICE})
     @GetMapping("")
     public RestResponse<Page<UserVO>> page(UserVO userVO, Page page){
         Page<UserVO> pages=userService.xPage(page,userVO);

biz-base/src/main/java/com/dayou/controller/WorkTaskRecordController.java

@@ -173,5 +173,30 @@ public class WorkTaskRecordController extends BaseController {
     public RestResponse<Page<AssetsTaskDoneVO>> getAssetsTaskDoneList(AssetsSelectDTO assetsSelectDTO, Page page) {
         return RestResponse.data(workTaskRecordService.getAssetsTaskDoneList(assetsSelectDTO, page));
     }
+
+
+    /**
+     * 个贷业务我的待办(入库)
+     * @param todoVO
+     * @param keyword
+     * @return
+     */
+    @GetMapping("/personal/inRep/todo")
+    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(PersonalTodoVO todoVO, String keyword){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(todoVO,keyword);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 个贷业务我的待办(出库)
+     * @param todoVO
+     * @param keyword
+     * @return
+     */
+    @GetMapping("/personal/outRep/todo")
+    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(todoVO,keyword);
+        return RestResponse.data(ret);
+    }
 }
 

dao/src/main/java/com/dayou/mapper/WorkTaskRecordMapper.java

@@ -57,4 +57,8 @@ public interface WorkTaskRecordMapper extends CustomBaseMapper<WorkTaskRecord> {
     TaskReminderVO getTaskReminderInfo(@Param("instanceNodeId") Long instanceNodeId);
 
     List<Long> getHandlerIdByLastNode(@Param("businessType")String businessType, @Param("businessId")Long businessId, @Param("businessSubId")String businessSubId, @Param("businessMinId")String businessMinId);
+
+    List<PersonalTodoVO> personalInRepTodoList(@Param("personal") PersonalTodoVO  personal, @Param("keyword")String keyword);
+
+    List<PersonalTodoVO> personalOutRepTodoList(@Param("personal") PersonalTodoVO todoVO, @Param("keyword")String keyword);
 }

dao/src/main/resources/mapper/BusinessIncomeMapper.xml

@@ -8,7 +8,7 @@
             fc.claim_amount as realAmount,
             mp.report_no,
             IF
-                ( fc.claim_datetime > mp.save_file_date, fc.claim_datetime, mp.save_file_date ) AS settleDate,
+            ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date ) AS settleDate,
             mp.NAME,
             mp.created,
             dd.NAME AS businessCate,
@@ -31,38 +31,50 @@
                 WHERE
                     deleted = 0
                   AND production_fund_id IS NOT NULL
-                  AND claim_datetime >= #{vo.startDate}
-                  AND claim_datetime  <= #{vo.endDate}
-                UNION ALL
+
+            ) fc
+                INNER JOIN ( SELECT id,order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
+                INNER JOIN (
                 SELECT
-                    allot_amount AS claim_amount,
-                    order_fund_id,
-                    production_fund_id,
-                    created AS claim_datetime
+                    id,
+                    major_id,
+                    NAME,
+                    report_no,
+                    production,
+                    evaluate_amount,
+                    delivery_date,
+                    fund.real_amount,
+                    created
                 FROM
-                    order_fund_allot
+                    major_production mpr
+                        INNER JOIN ( SELECT production_no, real_amount, production_type FROM production_fund WHERE deleted = 0 AND business_type = 'MAJOR_BUSINESS' ) fund ON ( fund.production_no = mpr.report_no AND fund.production_type = mpr.production )
                 WHERE
-                    deleted = 0
-                  AND created  >= #{vo.startDate}
-                  AND created <= #{vo.endDate}
-            ) fc
-                INNER JOIN ( SELECT id,order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-                INNER JOIN ( SELECT id, major_id, NAME, report_no, production, save_file_date, delivery_date,created FROM major_production WHERE deleted = 0 ) mp ON mp.report_no = pf.production_no
+                    fund.real_amount IS NOT NULL
+                  AND mpr.delivery_date IS NOT NULL
+            ) mp ON mp.report_no = pf.production_no
                 LEFT JOIN major m ON m.id = mp.major_id
                 INNER JOIN ( SELECT id,business_id, production_id, business_type ,commission_rate_id FROM commission_declare WHERE  deleted = 0 AND declare_result = '审核通过' ) cd ON (
-                        cd.business_id = m.id
-                    AND ( cd.production_id IS NULL OR cd.production_id = mp.id ))
+                cd.business_id = m.id
+                    AND ( cd.production_id = mp.id ))
                 LEFT JOIN business_commission_rate bcr ON bcr.id = cd.commission_rate_id
                 LEFT JOIN dict_data dd ON dd.id = bcr.business_cate_id
                 LEFT JOIN ( SELECT id,major_id,user_type, major_production_id, user_id, ratio ,declare_id FROM major_production_allot WHERE deleted = 0 ) mpa
-                          ON ( mpa.major_id = m.id and (mpa.major_production_id is null or mpa.major_production_id = mp.id )
+                          ON ( mpa.major_id = m.id and mpa.major_production_id = mp.id
                               and  if(mpa.user_type='MARKET','COMMISSION_DECLARE_MAJOR_MARKET','COMMISSION_DECLARE_MAJOR_EVALUATE') = cd.business_type
-                                 )
-                              and if(mpa.user_type='MARKET',mp.delivery_date is not null,mp.save_file_date is not null)
+                              )
+
                 left join user u on u.id = mpa.user_id
 
         WHERE
             u.id= #{vo.userId}
+        <if test="vo!=null and vo.startDate!=null and vo.startDate!='' ">
+            AND (select IF
+            ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date )) &gt;= #{vo.startDate}
+        </if>
+        <if test="vo!=null and vo.endDate!=null and vo.endDate!='' ">
+            AND (select IF
+            ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date )) &lt;= #{vo.endDate}
+        </if>
         order by settleDate DESC
     </select>
 

dao/src/main/resources/mapper/UserMapper.xml

@@ -65,6 +65,18 @@
             <if test="userVO!=null and userVO.keyword!=null and userVO.keyword!='' ">
                 and NAME like concat('%',#{userVO.keyword},'%') or staff_no like concat('%',#{userVO.keyword},'%')
             </if>
+            <if test="userVO!=null and userVO.departmentIds!=null and userVO.departmentIds.size!=0 ">
+                and id in (
+                select u.id from (select user_id from user_post where post_id in ( select id from post where department_id
+                in
+                <foreach collection="userVO.departmentIds" open="(" close=")" separator="," item="departmentId">
+                    #{departmentId}
+                </foreach>
+
+                and deleted = 0) and deleted = 0) u1
+                left join user u on u.id = u1.user_id where u.deleted = 0
+                )
+            </if>
         </where>
     </select>
 

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -681,4 +681,160 @@
                 </if>
             )
     </select>
+
+    <select id="personalInRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+        SELECT
+        wfni.id,
+        wtr.id AS taskId,
+        wfni.id AS currentNodeId,
+        wfni.business_id,
+        p.location,
+        p.order_id,
+        u1.name AS clientManager,
+        wfni.name AS nodeName,
+        wfni.code AS nodeCode,
+        u.name AS handlerName,
+        wtr.handler_id,
+        wtr.finished AS taskFinished,
+        p.created,
+        cc.name AS clientName,
+        cc1.name AS clientSubName,
+        p.agent,
+        cl.name AS contactName,
+        cl.mobile AS contactTel,
+        p.bailorA,
+        p.bailorB,
+        p.bailorA_tel,
+        p.bailorB_tel,
+        u2.name AS outwardStaffName,
+        u3.name AS inwardStaffName,
+        u4.name AS pricingStaffName,
+        wfni.created AS nodeCreated,
+        pt.acreage,
+        pt.amount,
+        pt.price,
+        pt.is_online,
+        c.comments
+        FROM
+        work_task_record wtr
+        LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
+        INNER JOIN (
+        SELECT
+        wn.name,
+        wn.CODE,
+        wfni.id,
+        wfni.business_id,
+        wfni.state,
+        wfni.created,
+        wfni.modified
+        FROM
+        work_flow_node_instance wfni
+        LEFT JOIN work_node wn ON wn.id = wfni.node_id
+        WHERE
+        wfni.business_type = 'PERSONAL_BUSINESS'
+        AND wfni.state = 'PENDING'
+        AND wfni.deleted = 0
+        AND wn.deleted = 0
+        ) wfni ON wtr.instance_id = wfni.id
+        LEFT JOIN personal p ON p.id = wfni.business_id
+        LEFT JOIN customer_company cc ON cc.id = p.clientele_id
+        LEFT JOIN customer_company cc1 ON cc1.id = p.clientele_sub_id
+        LEFT JOIN customer_linkman cl ON cl.id = p.clientele_contact_id
+        LEFT JOIN user u ON u.id = wtr.handler_id
+        LEFT JOIN user u1 ON u1.id = p.client_manager_id
+        LEFT JOIN user u2 ON u2.id = p.outward_staff
+        LEFT JOIN user u3 ON u3.id = p.inward_staff
+        LEFT JOIN user u4 ON u4.id = p.pricing_staff
+        LEFT JOIN personal_target pt ON pt.personal_id = p.id
+        left join (
+        select business_id,comments from work_flow_log where concat(business_id,created) in (
+        select concat(business_id,max(created)) from work_flow_log where business_type = 'PERSONAL_BUSINESS' and comments is not null  group BY business_id
+        )
+        ) c on c.business_id = p.id
+        WHERE
+        wtr.handler_id = #{personal.handlerId}
+        AND u.deleted = 0
+        AND wnt.deleted = 0
+        AND wtr.deleted = 0
+        AND wfni.code in ('STATEMENT_IN','REPORT_IN','LETTER_IN')
+        order by wfni.modified DESC
+    </select>
+
+    <select id="personalOutRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+        SELECT
+            wfni.id,
+            wtr.id AS taskId,
+            wfni.id AS currentNodeId,
+            wfni.business_id,
+            p.location,
+            p.order_id,
+            u1.name AS clientManager,
+            wfni.name AS nodeName,
+            wfni.code AS nodeCode,
+            u.name AS handlerName,
+            wtr.handler_id,
+            wtr.finished AS taskFinished,
+            p.created,
+            cc.name AS clientName,
+            cc1.name AS clientSubName,
+            p.agent,
+            cl.name AS contactName,
+            cl.mobile AS contactTel,
+            p.bailorA,
+            p.bailorB,
+            p.bailorA_tel,
+            p.bailorB_tel,
+            u2.name AS outwardStaffName,
+            u3.name AS inwardStaffName,
+            u4.name AS pricingStaffName,
+            wfni.created AS nodeCreated,
+            pt.acreage,
+            pt.amount,
+            pt.price,
+            pt.is_online,
+            c.comments
+        FROM
+            work_task_record wtr
+                LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
+                INNER JOIN (
+                SELECT
+                    wn.name,
+                    wn.CODE,
+                    wfni.id,
+                    wfni.business_id,
+                    wfni.state,
+                    wfni.created,
+                    wfni.modified
+                FROM
+                    work_flow_node_instance wfni
+                        LEFT JOIN work_node wn ON wn.id = wfni.node_id
+                WHERE
+                    wfni.business_type = 'PERSONAL_BUSINESS'
+                  AND wfni.state = 'PENDING'
+                  AND wfni.deleted = 0
+                  AND wn.deleted = 0
+            ) wfni ON wtr.instance_id = wfni.id
+                LEFT JOIN personal p ON p.id = wfni.business_id
+                LEFT JOIN customer_company cc ON cc.id = p.clientele_id
+                LEFT JOIN customer_company cc1 ON cc1.id = p.clientele_sub_id
+                LEFT JOIN customer_linkman cl ON cl.id = p.clientele_contact_id
+                LEFT JOIN user u ON u.id = wtr.handler_id
+                LEFT JOIN user u1 ON u1.id = p.client_manager_id
+                LEFT JOIN user u2 ON u2.id = p.outward_staff
+                LEFT JOIN user u3 ON u3.id = p.inward_staff
+                LEFT JOIN user u4 ON u4.id = p.pricing_staff
+                LEFT JOIN personal_target pt ON pt.personal_id = p.id
+                left join (
+                select business_id,comments from work_flow_log where concat(business_id,created) in (
+                    select concat(business_id,max(created)) from work_flow_log where business_type = 'PERSONAL_BUSINESS' and comments is not null  group BY business_id
+                )
+            ) c on c.business_id = p.id
+        WHERE
+            wtr.handler_id = #{personal.handlerId}
+          AND u.deleted = 0
+          AND wnt.deleted = 0
+          AND wtr.deleted = 0
+          AND wfni.code in ('STATEMENT_OUT','REPORT_OUT','LETTER_OUT')
+        order by wfni.modified DESC
+    </select>
 </mapper>

domain/src/main/java/com/dayou/dto/WorkNodeCommit.java

@@ -100,4 +100,8 @@ public class WorkNodeCommit {
      */
     private Boolean ifPay;
 
+    private String nodeCode;
+
+    private Long businessId;
+
 }

domain/src/main/java/com/dayou/vo/TaskReminderVO.java

@@ -15,7 +15,7 @@ public class TaskReminderVO {
 
     private String no;
 
-    private Date created;
+    private String created;
 
     private Long businessId;
 

domain/src/main/java/com/dayou/vo/UserVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 类说明：
@@ -23,5 +24,8 @@ public class UserVO extends User {
     private String keyword;
     private String staffNo;
     private String name;
+
+    private List<Long> departmentIds;
+    private Set<Long> userIds;
 }
 

service/src/main/java/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.java

@@ -92,7 +92,6 @@ public class BusinessProductionPerformanceServiceImpl extends ServiceImpl<Busine
                             bpp.setFatalMistakes(new ArrayList<>());
                             bpp.setXFatalMistakes(new ArrayList<>());
                         }else {
-                            bpp.setCheckLoop(performance.getCheckLoop());
                             bpp.setProductionId(bpp.getPId());
                             JSONObject jsonObject = JSON.parseObject(bpp.getReason());
                             if (jsonObject!=null){

service/src/main/java/com/dayou/service/impl/MessageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dayou.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -22,6 +23,7 @@ import com.dayou.message.handler.SystemMessageHandler;
 import com.dayou.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.service.workflow.IWorkTaskRecordService;
+import com.dayou.utils.DateUtils;
 import com.dayou.utils.LoginContext;
 import com.dayou.vo.CommissionDeclareVO;
 import com.dayou.vo.ItemVO;
@@ -44,6 +46,7 @@ import static com.dayou.enums.BusinessReplyEnum.MARKET_VISIT_REPLY;
 import static com.dayou.message.MessageTitle.*;
 import static com.dayou.message.MessageTitle.MAJOR_DECLARE_REMIND;
 import static com.dayou.message.MessageTypeEnum.*;
+import static com.dayou.utils.DateUtils.YYYY_MM_DD_HH_MM_SS;
 
 /**
  * <p>
@@ -291,7 +294,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
             message.setMessage(new StringBuilder(taskReminderVO.getUser()).append("提交").append(taskReminderVO.getBusinessType())
                     .append(StrUtil.isNotBlank(taskReminderVO.getNo())?taskReminderVO.getNo():"").append("的新的流程待办，请及时处理。").toString());
             this.save(message);
-            taskReminderVO.setCreated(message.getCreated());
+            taskReminderVO.setCreated(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS,message.getCreated()));
             taskReminderVO.setHandlerId(handlerId);
             //发送websocket
             webSocketServer.sendNodeReminder(taskReminderVO);
@@ -302,7 +305,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
     public void sendWebSocket() {
         TaskReminderVO taskReminderVO = new TaskReminderVO();
         taskReminderVO.setId(RandomUtil.randomLong());
-        taskReminderVO.setCreated(new Date());
+        taskReminderVO.setCreated(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS,new Date()));
         taskReminderVO.setHandlerId(1L);
         taskReminderVO.setUser("管理员");
         taskReminderVO.setNo("2025010001");

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -196,9 +196,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         User user = checkUserLogin(account, pwd);
 
-        if (user.getEnable().equals(Boolean.FALSE)) {
-            ErrorCode.throwBusinessException(USER_DISABLE);
-        }
+//        if (user.getEnable().equals(Boolean.FALSE)) {
+//            ErrorCode.throwBusinessException(USER_DISABLE);
+//        }
 
         Long userId = user.getId();
 

service/src/main/java/com/dayou/service/workflow/IWorkTaskRecordService.java

@@ -72,4 +72,8 @@ public interface IWorkTaskRecordService extends IService<WorkTaskRecord> {
      * @return
      */
     Long getHandlerIdByLastNode(String businessType,Long businessId,String businessSubId,String businessMinId);
+
+    List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword);
+
+    List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword);
 }

service/src/main/java/com/dayou/service/workflow/WorkFlowServiceImpl.java

@@ -2,22 +2,25 @@ package com.dayou.service.workflow;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.WorkNodeCommit;
 import com.dayou.dto.WorkNodeDTO;
 import com.dayou.dto.WorkNodeInstanceTaskDTO;
-import com.dayou.entity.WorkFlow;
-import com.dayou.entity.WorkFlowNodeInstance;
-import com.dayou.entity.WorkNodeTask;
+import com.dayou.entity.*;
 import com.dayou.enums.MainBusinessEnum;
+import com.dayou.enums.ProductionEnum;
 import com.dayou.enums.workflow.NodeLogEnum;
 import com.dayou.enums.workflow.NodeStateEnum;
 import com.dayou.exception.ErrorCode;
+import com.dayou.mapper.PersonalMapper;
+import com.dayou.mapper.PersonalTargetMapper;
 import com.dayou.mapper.WorkFlowMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.mapper.WorkTaskRecordMapper;
 import com.dayou.message.annotation.SendMessage;
+import com.dayou.service.IPersonalService;
 import com.dayou.utils.LoginContext;
 import com.dayou.vo.NameCodeVO;
 import com.dayou.workflow.handler.AssetsNodeHandler;
@@ -36,6 +39,7 @@ import java.util.stream.Collectors;
 
 import static com.dayou.enums.MainBusinessEnum.*;
 import static com.dayou.enums.workflow.NodeLogEnum.*;
+import static com.dayou.enums.workflow.WorkflowNodeEnum.REPORT_OUT;
 import static com.dayou.message.MessageTypeEnum.NODE_TODO_REMINDER;
 
 /**
@@ -73,6 +77,12 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
     @Autowired
     private WorkNodeProcessable workNodeProcessable;
 
+    @Autowired
+    private PersonalTargetMapper personalTargetMapper;
+
+    @Autowired
+    private PersonalMapper personalMapper;
+
 
     @Override
     @SuppressWarnings("unchecked")
@@ -157,6 +167,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
     @Transactional(rollbackFor = Exception.class)
     public Boolean batchCommit(List<WorkNodeCommit> workNodeCommits) {
         for (WorkNodeCommit workNodeCommit : workNodeCommits){
+            appendWorkNodeCommit(workNodeCommit);
             Boolean success = commit(workNodeCommit);
             // 碰到提交失败的流程抛出异常
             if (!success){
@@ -281,4 +292,16 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
         }
         return Boolean.FALSE;
     }
+
+    private void appendWorkNodeCommit(WorkNodeCommit workNodeCommit){
+        if (REPORT_OUT.name().equals(workNodeCommit.getNodeCode())){
+            PersonalTarget personalTarget = personalTargetMapper.selectOne(new LambdaQueryWrapper<PersonalTarget>().eq(PersonalTarget::getPersonalId, workNodeCommit.getBusinessId())
+                    .select(PersonalTarget::getFeedback).eq(BaseEntity::getDeleted, Boolean.FALSE));
+            workNodeCommit.setProduction(JSON.parseArray(personalTarget.getFeedback(), ProductionEnum.class));
+            Personal personal = personalMapper.selectOne(new LambdaQueryWrapper<Personal>().select(Personal::getClienteleId).eq(BaseEntity::getId, workNodeCommit.getBusinessId()).eq(BaseEntity::getDeleted, Boolean.FALSE));
+            if (personal != null){
+                workNodeCommit.setCcId(personal.getClienteleId());
+            }
+        }
+    }
 }

service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -193,4 +194,18 @@ public class WorkTaskRecordServiceImpl extends ServiceImpl<WorkTaskRecordMapper,
         return null;
     }
 
+    @Override
+    public List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword) {
+        todoVO.setHandlerId(LoginContext.getCurrentUserId());
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalInRepTodoList(todoVO,keyword);
+        return ret;
+    }
+
+    @Override
+    public List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword) {
+        todoVO.setHandlerId(LoginContext.getCurrentUserId());
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalOutRepTodoList(todoVO,keyword);
+        return ret;
+    }
+
 }