From d7729090111111db3ec90fb01cd06e459b9cddc5 Mon Sep 17 00:00:00 2001
From: liugang <liugang@chandao.com>
Date: Sun, 28 Sep 2025 14:08:37 +0800
Subject: [PATCH] * [misc] Fix unit tests for programplanModel::getByList()
 method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 module/programplan/test/model/getbylist.php | 77 ++++++++++++---------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/module/programplan/test/model/getbylist.php b/module/programplan/test/model/getbylist.php
index 98e68eec35..6898570b94 100755
--- a/module/programplan/test/model/getbylist.php
+++ b/module/programplan/test/model/getbylist.php
@@ -11,47 +11,56 @@ cid=0
 - 步骤2：传入空数组 @0
 - 步骤3：传入不存在的ID数组 @0
 - 步骤4：传入单个ID数组 @1
-- 步骤5：传入混合ID数组 @2
+- 步骤5：传入混合ID数组（存在和不存在的ID混合） @2
 
 */
 
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/lib/programplan.unittest.class.php';
 
-// 清理现有数据
-global $tester;
-$tester->dao->delete()->from(TABLE_PROJECT)->where('type')->eq('project')->exec();
-$tester->dao->delete()->from(TABLE_PROJECTPRODUCT)->exec();
-
-// 直接插入测试数据
-$projects = array(
-    array('id' => 1, 'type' => 'project', 'name' => '测试项目1', 'code' => 'PRJ001', 'status' => 'doing', 'deleted' => '0', 'openedBy' => 'admin', 'openedDate' => '2024-01-01 10:00:00'),
-    array('id' => 2, 'type' => 'project', 'name' => '测试项目2', 'code' => 'PRJ002', 'status' => 'wait', 'deleted' => '0', 'openedBy' => 'admin', 'openedDate' => '2024-01-02 10:00:00'),
-    array('id' => 3, 'type' => 'project', 'name' => '测试项目3', 'code' => 'PRJ003', 'status' => 'doing', 'deleted' => '0', 'openedBy' => 'admin', 'openedDate' => '2024-01-03 10:00:00'),
-    array('id' => 4, 'type' => 'project', 'name' => '项目A', 'code' => 'PROJ_A', 'status' => 'closed', 'deleted' => '0', 'openedBy' => 'admin', 'openedDate' => '2024-01-04 10:00:00'),
-    array('id' => 5, 'type' => 'project', 'name' => '项目B', 'code' => 'PROJ_B', 'status' => 'doing', 'deleted' => '0', 'openedBy' => 'admin', 'openedDate' => '2024-01-05 10:00:00'),
-);
-
-foreach($projects as $project) {
-    $tester->dao->insert(TABLE_PROJECT)->data($project)->exec();
-}
-
-// 插入项目产品关联数据
-$projectProducts = array(
-    array('project' => 1, 'product' => 1, 'branch' => 0),
-    array('project' => 2, 'product' => 1, 'branch' => 0),
-    array('project' => 3, 'product' => 2, 'branch' => 0),
-    array('project' => 4, 'product' => 2, 'branch' => 0),
-    array('project' => 5, 'product' => 3, 'branch' => 0),
-);
-
-foreach($projectProducts as $pp) {
-    $tester->dao->insert(TABLE_PROJECTPRODUCT)->data($pp)->exec();
-}
-
-// 用户登录
 su('admin');
 
+global $tester;
+$dao = $tester->dao;
+
+// 清理现有数据
+$dao->delete()->from(TABLE_PROJECT)->where('id')->in('1,2,3,999,1000')->exec();
+
+// 插入项目测试数据（只插入必要字段）
+try {
+    $dao->insert(TABLE_PROJECT)->data(array(
+        'id' => 1,
+        'type' => 'project',
+        'name' => '测试项目1',
+        'status' => 'doing',
+        'openedBy' => 'admin',
+        'openedDate' => date('Y-m-d H:i:s'),
+        'deleted' => '0'
+    ))->exec();
+
+    $dao->insert(TABLE_PROJECT)->data(array(
+        'id' => 2,
+        'type' => 'project',
+        'name' => '测试项目2',
+        'status' => 'doing',
+        'openedBy' => 'admin',
+        'openedDate' => date('Y-m-d H:i:s'),
+        'deleted' => '0'
+    ))->exec();
+
+    $dao->insert(TABLE_PROJECT)->data(array(
+        'id' => 3,
+        'type' => 'project',
+        'name' => '测试项目3',
+        'status' => 'wait',
+        'openedBy' => 'admin',
+        'openedDate' => date('Y-m-d H:i:s'),
+        'deleted' => '0'
+    ))->exec();
+} catch(Exception $e) {
+    // 如果插入失败，继续执行测试（测试环境可能已有数据）
+}
+
 // 创建测试实例
 $programplanTest = new programplanTest();
 
@@ -59,4 +68,4 @@ r($programplanTest->getByListTest(array(1, 2, 3))) && p() && e(3); // 步骤1：
 r($programplanTest->getByListTest(array())) && p() && e(0); // 步骤2：传入空数组
 r($programplanTest->getByListTest(array(999, 1000))) && p() && e(0); // 步骤3：传入不存在的ID数组
 r($programplanTest->getByListTest(array(1))) && p() && e(1); // 步骤4：传入单个ID数组
-r($programplanTest->getByListTest(array(1, 999, 2))) && p() && e(2); // 步骤5：传入混合ID数组
\ No newline at end of file
+r($programplanTest->getByListTest(array(1, 999, 2))) && p() && e(2); // 步骤5：传入混合ID数组（存在和不存在的ID混合）
\ No newline at end of file