From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
index 7a2c882..f9a626c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
@@ -1,10 +1,11 @@
 package com.mes.pp.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.pp.entity.OptimizeProject;
 import com.mes.pp.entity.request.OptimizeRequest;
-import org.apache.ibatis.annotations.Mapper;
+import liquibase.pro.packaged.L;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,8 +17,44 @@
  * @author zhoush
  * @since 2024-04-16
  */
-@Mapper
 @DS("pp")
-public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> {
+public interface OptimizeProjectMapper extends MPJBaseMapper<OptimizeProject> {
     List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
+
+    /**
+     * 鏌ヨ宸ョ▼淇℃伅
+     *
+     * @return
+     */
+    List<OptimizeProject> queryEngineer();
+
+    /**
+     * 鏌ヨ宸ョ▼鎺掍骇淇℃伅
+     *
+     * @param optimizeProject
+     * @return
+     */
+    List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject);
+
+    /**
+     * 鍒犻櫎宸ョ▼淇℃伅
+     *
+     * @param type
+     */
+    void deleteByType(@Param("type") Integer type);
+
+    /**
+     * 鏇存柊宸ョ▼淇℃伅
+     *
+     * @param projectList
+     */
+    void batchInsert(@Param("list") List<OptimizeProject> projectList);
+
+    /**
+     * 鏇存柊宸ョ▼鎺掍骇淇℃伅
+     *
+     * @param engineerId
+     * @param types
+     */
+    void deleteByScheduling(@Param("engineerId") String engineerId,@Param("types") List<Integer> types);
 }

--
Gitblit v1.8.0