From 881e2efaf1e9f3feb79f522f696691ccd48ed0a4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 30 十一月 2024 01:26:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
index c7eb055..381c0b0 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ycl.domain.entity.ProjectPlanExamineRecord;
 import com.ycl.domain.entity.ProjectPlanRecord;
 import com.ycl.domain.vo.DepartmentApprovalResponseVO;
+import com.ycl.domain.vo.ProjectProcessToDoVo;
 import com.ycl.mapper.ProjectPlanExamineRecordMapper;
 import com.ycl.mapper.ProjectPlanRecordMapper;
 import com.ycl.service.ProjectPlanExamineRecordService;
@@ -39,6 +40,7 @@
 
     /**
      * 娣诲姞
+     *
      * @param form
      * @return
      */
@@ -51,6 +53,7 @@
 
     /**
      * 淇敼
+     *
      * @param form
      * @return
      */
@@ -67,6 +70,7 @@
 
     /**
      * 鎵归噺鍒犻櫎
+     *
      * @param ids
      * @return
      */
@@ -78,6 +82,7 @@
 
     /**
      * id鍒犻櫎
+     *
      * @param id
      * @return
      */
@@ -89,6 +94,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param query
      * @return
      */
@@ -101,6 +107,7 @@
 
     /**
      * 鏍规嵁id鏌ユ壘
+     *
      * @param id
      * @return
      */
@@ -113,6 +120,7 @@
 
     /**
      * 鍒楄〃
+     *
      * @return
      */
     @Override
@@ -126,18 +134,19 @@
 
     @Override
     public Result departmentApproval(Integer projectPlanRecordId) {
-        List<DepartmentApprovalResponseVO> vo =baseMapper.selectInfo(projectPlanRecordId);
+        List<DepartmentApprovalResponseVO> vo = baseMapper.selectInfo(projectPlanRecordId);
         return Result.ok().data(vo);
     }
 
     @Override
     public Result planLog(Integer projectPlanRecordId) {
-        List<DepartmentApprovalResponseVO> vo =baseMapper.getPlanLog(projectPlanRecordId);
+        List<DepartmentApprovalResponseVO> vo = baseMapper.getPlanLog(projectPlanRecordId);
         return Result.ok().data(vo);
     }
 
     /**
      * 鍥炲瀹℃壒浜嬮」
+     *
      * @param form
      * @return
      */
@@ -154,7 +163,7 @@
     @Override
     public Result saveExamine(ProjectPlanExamineRecordForm form) {
         // 鍒ゆ柇锛屽鏋滈兘鍚屾剰锛屽垯鐩存帴鏇存柊瀹℃壒璁板綍
-        if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0){
+        if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) {
             ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
             projectPlanExamineRecord.setId(form.getId().longValue());
             projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId());
@@ -164,10 +173,19 @@
         // 鍚﹀垯锛屽皢椤圭洰璁板綍璁剧疆涓烘湭涓婃姤锛屽苟灏嗚褰曢�昏緫鍒犻櫎
         new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
                 .eq(ProjectPlanRecord::getId, form.getProjectPlanRecordId())
-                .set(ProjectPlanRecord::getReportStatus,1);
+                .set(ProjectPlanRecord::getReportStatus, 1);
         new LambdaUpdateChainWrapper<>(baseMapper)
                 .eq(ProjectPlanExamineRecord::getProjectPlanRecordId, form.getProjectPlanRecordId())
                 .remove();
         return Result.ok("鍥炲鎴愬姛");
     }
+
+    @Override
+    public Result todoList(Long userId, ProjectPlanExamineRecordQuery query) {
+
+        IPage<ProjectProcessToDoVo> page = PageUtil.getPage(query, ProjectProcessToDoVo.class);
+
+        baseMapper.todoList(page, query, userId);
+        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    }
 }

--
Gitblit v1.8.0