Merge branch 'develop'

prisma/migrations/20250123071252_add_remark_task_order/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TaskOrder" ADD COLUMN     "remark" TEXT;

prisma/schema.prisma

@@ -1547,6 +1547,8 @@ model TaskOrder {
   taskOrderStatus TaskOrderStatus @default(Pending)
   taskList        Task[]
 
+  remark String?
+
   contactName String
   contactTel  String
 

src/controllers/07-task-controller.ts

@@ -227,6 +227,8 @@ export class TaskController extends Controller {
       institutionId: string;
       registeredBranchId?: string;
 
+      remark?: string;
+
       taskList: { requestWorkId: string; step: number }[];
       taskProduct: { productId: string; discount?: number }[];
     },
@@ -358,6 +360,8 @@ export class TaskController extends Controller {
 
       institutionId: string;
 
+      remark?: string;
+
       taskList: { requestWorkId: string; step: number }[];
       taskProduct: { productId: string; discount?: number }[];
     },
@@ -428,12 +432,14 @@ export class TaskController extends Controller {
         data: {
           ...body,
           taskList: {
-            deleteMany: record?.taskList.filter(
+            deleteMany: record?.taskList
-              (lhs) =>
+              .filter(
-                !body.taskList.find(
+                (lhs) =>
-                  (rhs) => lhs.requestWorkId === rhs.requestWorkId && lhs.step === rhs.step,
+                  !body.taskList.find(
-                ),
+                    (rhs) => lhs.requestWorkId === rhs.requestWorkId && lhs.step === rhs.step,
-            ),
+                  ),
+              )
+              .map((v) => ({ id: v.id })),
             createMany: {
               data: body.taskList.filter(
                 (lhs) =>