From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 08:30:56 +0800
Subject: [PATCH] 1、 钢化前钢化出片逻辑调整，避免卧转立信号对调度任务的影响 2、修改出片方式，当玻璃未在关系表时，默认出一片 3、中空新增进片线路校验，避免钢化重复报工
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 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..a44342a 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,12 @@
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.dto.ProgressDTO;
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 +18,51 @@
* @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);
+
+ /**
+ * 鏌ヨ宸ョ▼杩涘害
+ *
+ * @param engineerId
+ */
+ List<ProgressDTO> selectProgress(@Param("engineerId") String engineerId);
}
--
Gitblit v1.8.0