merge master-ukk

packages/cpt_uk/lib/modules/attendance/security_registration/item_security_registration.dart

@@ -57,7 +57,7 @@ class SecurityRegistrationItem extends StatelessWidget {
                 fontSize: 14,
                 marginLeft: 5,
                 marginRight: 5,
-                textDecoration: TextDecoration.underline,
+                // textDecoration: TextDecoration.underline,
                 decorationColor: ColorConstants.textYellowFFBB1B,
                 // 可选，设置下划线的颜色
                 decorationThickness: 2.0,

packages/cpt_uk/lib/modules/attendance/security_registration/security_registration_controller.dart

@@ -185,12 +185,17 @@ class SecurityRegistrationController extends GetxController with DioCancelableMi
 
   /// 展示编辑的弹窗
   void showEditDialog(UKSecurityAttendanceRows data) {
+    // Log.d("编辑时的 data  ${data}");
     String? dateStr = data.jobTime?.split(" ")[0];
     String? startStr = data.jobTime?.split(" ").sublist(1).join(" ").split(" ~ ")[0];
     String? endStr = data.jobTime?.split(" ").sublist(1).join(" ").split(" ~ ")[1];
 
     if (dateStr == null || startStr == null || endStr == null) return;
 
+    // Log.d("9999  ${DateTimeUtils.getDateTime(data.securityIn?.time == null ? "" : "$dateStr ${data.securityIn?.time}")}");
+    // Log.d("55  ${data.securityIn?.time}");
+    // Log.d("444  ${DateTimeUtils.getDateTime("${data.securityIn?.time}")}");
+    // Log.d("5455  $dateStr ${data.securityIn?.time}");
     DialogEngine.show(
       widget: SecurityEditDialog(
         startTime: DateTimeUtils.getDateTime("$dateStr $startStr"),
@@ -207,6 +212,8 @@ class SecurityRegistrationController extends GetxController with DioCancelableMi
 
   /// 请求接口提交门卫签到数据
   void _submitAttendance(String? appliedId, DateTime? inTime, DateTime? outTime) async {
+    // Log.d("inTime ${inTime}");
+    // Log.d("outTime ${outTime}");
     final result = await _attendanceRepository.submitSecurityAttendanceEdit(
       appliedId: appliedId,
       formView: "security",
@@ -232,13 +239,17 @@ class SecurityRegistrationController extends GetxController with DioCancelableMi
           (element) => element.id == appliedId,
     );
 
+    // inTime 为 yyyy-MM-dd HH:mm:ss 直接取值 HH:mm
+    String inTime_hhmm  = inTime.split(" ")[1];
+    String outTime_hhmm = outTime.split(" ")[1];
+
     if (element != null) {
       element.securityIn ??= UKSecurityInOut();
-      element.securityIn?.time = inTime;
+      element.securityIn?.time = inTime_hhmm;
       element.securityIn?.changed = 1;
 
       element.securityOut ??= UKSecurityInOut();
-      element.securityOut?.time = outTime;
+      element.securityOut?.time = outTime_hhmm;
       element.securityOut?.changed = 1;
 
       update();

packages/cpt_uk/lib/modules/job/job_applied/job_applied_controller.dart

@@ -164,6 +164,7 @@ class JobAppliedController extends GetxController with DioCancelableMixin {
   void registerEventBus() {
     subscribe = bus.on(AppConstant.eventAppliedListRefresh, (arg) {
       var appliedId = arg as String;
+      Log.d("job_applied controller 收到刷新事件 获得的参数applied Id：$appliedId");
       if (Utils.isNotEmpty(appliedId)) {
         fetchItemByIdAndRefreshItem(appliedId);
       } else {

packages/cpt_uk/lib/modules/job/job_applied_edit/job_applied_edit_controller.dart

@@ -7,6 +7,8 @@ import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:shared/utils/date_time_utils.dart';
 import 'package:shared/utils/event_bus.dart';
+import 'package:shared/utils/log_utils.dart';
+import 'package:shared/utils/util.dart';
 import 'package:widgets/picker/date_picker_util.dart';
 
 import 'job_applied_edit_state.dart';
@@ -21,6 +23,14 @@ class JobAppliedEditController extends GetxController with DioCancelableMixin {
 
     if (result.isSuccess) {
       state.appliedEditView = result.data;
+      // 开始如果 state.appliedEditView?.workIn 为空时，则将 state.appliedEditView?.startTime 赋值给 state.appliedEditView?.workIn
+      if(Utils.isEmpty(state.appliedEditView?.workIn)){
+        state.appliedEditView?.workIn = state.appliedEditView?.startTime;
+      }
+      if(Utils.isEmpty(state.appliedEditView?.workOut)){
+        state.appliedEditView?.workOut = state.appliedEditView?.endTime;
+      }
+
 
       var addHourController = state.formData['add_hours']!['controller'];
       var totalRoomController = state.formData['total_room']!['controller'];
@@ -73,7 +83,7 @@ class JobAppliedEditController extends GetxController with DioCancelableMixin {
     );
   }
 
-  /// 选择时间
+  /// 选择门卫签到时间
   void pickSecurityInTime() {
     if (state.appliedEditView == null) return;
 
@@ -88,7 +98,7 @@ class JobAppliedEditController extends GetxController with DioCancelableMixin {
     );
   }
 
-  /// 选择时间
+  /// 选择门卫签出时间
   void pickSecurityOutTime() {
     if (state.appliedEditView == null) return;
 
@@ -166,6 +176,7 @@ class JobAppliedEditController extends GetxController with DioCancelableMixin {
     state.appliedEditView!.adjustHours = addHourController.text.toString();
     state.appliedEditView!.coReason = reasonController.text.toString();
 
+    Log.d("编辑 准备提交的 JobListAppliedEditEntity  ${state.appliedEditView}");
     //请求网络提交修改
     var result = await _jobRepository.editAppliedSingleStaffInfo(state.appliedId, state.appliedEditView!);
 

packages/cpt_uk/lib/modules/job/job_applied_edit/job_applied_edit_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:shared/utils/log_utils.dart';
+import 'package:shared/utils/util.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
@@ -301,7 +302,7 @@ class _JobAppliedEditState extends BaseState<UKJobAppliedEditPage, JobAppliedEdi
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
                             MyTextView(
-                              state.appliedEditView?.workIn ?? "-",
+                              Utils.isNotEmpty(state.appliedEditView?.workIn)? state.appliedEditView!.workIn! : (state.appliedEditView?.startTime ?? "-"),
                               fontSize: 14,
                               hint: "Work In".tr,
                               textHintColor: ColorConstants.textGrayAECAE5,
@@ -342,7 +343,7 @@ class _JobAppliedEditState extends BaseState<UKJobAppliedEditPage, JobAppliedEdi
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
                             MyTextView(
-                              state.appliedEditView?.workOut ?? "-",
+                              Utils.isNotEmpty(state.appliedEditView?.workOut)? state.appliedEditView!.workOut! : (state.appliedEditView?.endTime ?? "-"),
                               fontSize: 14,
                               hint: "Work Out".tr,
                               textHintColor: ColorConstants.textGrayAECAE5,

packages/cpt_uk/lib/modules/job/job_applied_staff_detail/staff_detail_widget.dart

@@ -315,18 +315,24 @@ class StaffDetailWidget extends StatelessWidget {
   Widget _buildCertificateWidget(BuildContext context,UkStaffDetailCertificates certificateItem, int index ){
     return Row(
       children: [
-          MyTextView(
-            '${certificateItem.type!}:',
-            textColor: ColorConstants.textGrayAECAE5,
-            fontSize: 14,
-            isFontRegular: true,
+          Flexible(
+            flex: 1,
+            child: MyTextView(
+              '${certificateItem.type!}:',
+              textColor: ColorConstants.textGrayAECAE5,
+              fontSize: 14,
+              isFontRegular: true,
+            ),
           ),
-          MyTextView(
-            certificateItem.status?? "",
-            textColor: _getStatusColor(certificateItem.statusColor?? ''),
-            fontSize: 14,
-            isFontRegular: true,
-            marginLeft: 5,
+          Flexible(
+            flex: 2,
+            child: MyTextView(
+              certificateItem.status?? "",
+              textColor: _getStatusColor(certificateItem.statusColor?? ''),
+              fontSize: 14,
+              isFontRegular: true,
+              marginLeft: 5,
+            ),
           ).onTap((){
             onScanCertificateAction?.call(context, certificateItem);
           }),

packages/cpt_uk/lib/modules/job/labour_request_add/labour_request_add_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:cpt_uk/modules/job/labour_request_add/widget/labour_request_interface.dart';
+import 'package:cpt_uk/modules/job/labour_request_add/widget/uploadFileField.dart';
 import 'package:domain/entity/response/uk_labour_request_detail_entity.dart';
 import 'package:domain/repository/labour_repository.dart';
 import 'package:domain/repository/uk_job_repository.dart';
@@ -73,6 +74,61 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
       state.jobSelectJobStart = state.labReqOption?.jobStart?? '';
       state.jobSelectJobEnd = state.labReqOption?.jobEnd?? '';
 
+      // 证书回显
+      state.labReqOption?.certificateList?.forEach((e)=> {
+       if(e.checked == 'checked'){
+         state.selectedCertificateList?.add(e.value.toString())
+       }
+      });
+      // 车辆回显
+      state.labReqOption?.vehicleList?.forEach((e)=> {
+        if(e.checked == 'checked'){
+          state.selectedVehicleList?.add(e.value.toString())
+        }
+      });
+
+      //回显 challenge25
+      // 遍历 state.challenge25List 中找到  checked 为  checked 的项
+      int? challenge25Index = state.labReqOption?.challenge25List?.indexWhere((e) => e.checked == "checked") ?? -1;
+      if (challenge25Index != -1) {
+        state.selectedChallenge25Id = state.labReqOption?.challenge25List?[challenge25Index].value.toString();
+      }else {
+        // 将 state.labReqOption?.challenge25List 的 value 为 0 的 修改为 checked
+        state.labReqOption?.challenge25List?.forEach((e) {
+          if (e.value == 0) {
+            e.checked = "checked";
+            state.selectedChallenge25Id = e.value.toString();
+          }
+        });
+      }
+
+
+      state.videoText = state.labReqOption?.videoText?? '';
+      state.videoCover = state.labReqOption?.videoCover?? '';
+      state.video = state.labReqOption?.video?? '';
+      state.otherImage = state.labReqOption?.otherImage?? '';
+      state.otherDocument = state.labReqOption?.otherDocument?? '';
+      // 修改 state.uploadFieldList 对应的 fieldPathValueList
+      state.uploadFieldList.forEach((element) {
+        if (element.fieldKey == 'video_cover_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.videoCover ?? '');
+          Log.d("video_cover 初始值  ${element.fieldPathValueList}");
+        }
+        if (element.fieldKey == 'video_video_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.video ?? '');
+        }
+        if (element.fieldKey == 'video_image_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.otherImage ?? '');
+        }
+        if (element.fieldKey == 'video_document_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.otherDocument ?? '');
+        }
+      });
+
       if(state.pageType == 0){
         // 新增
         state.noStaff = '';
@@ -96,6 +152,7 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
       var revenueController = state.formData['revenue']!['controller'];
       var positionController = state.formData['position']!['controller'];
       var totalCostController = state.formData['total_cost']!['controller'];
+
       remarkController.text = state.labReqOption?.description ?? '';
       eventController.text = state.labReqOption?.eventName ?? "";
       eventTypeController.text = state.labReqOption?.eventType ?? "";
@@ -104,6 +161,9 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
       positionController.text = state.labReqOption?.position ?? "";
       totalCostController.text = state.labReqOption?.estCost ?? "";
 
+      var vidoeTextController = state.formData['video_text']!['controller'];
+      vidoeTextController.text = state.videoText??'';
+
 
       state.selectedDepartmentId = state.labReqOption?.departmentId.toString();
       //时薪还是房间计费
@@ -118,12 +178,91 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
   @override
   void onReady() {
     super.onReady();
+    state.uploadFieldList = [
+      FileFieldItem(
+        fieldKey: 'video_cover_key',
+        fieldLabel: 'Video Cover'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '10MB',
+        allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          // print("选中的文件: ${files.length}个");
+          if(files.length>0){
+            state.videoCover = files[0].path;
+            update();
+          }
+        }
+      ),
+      FileFieldItem(
+        fieldKey: 'video_video_key',
+        fieldLabel: 'Video'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '20MB',
+        allowedFileTypes: ['mp4'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.video = files[0].path;
+            update();
+          }
+        },
+      ),
+      FileFieldItem(
+        fieldKey: 'video_image_key',
+        fieldLabel: 'Video Image'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '10MB',
+        allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.otherImage = files[0].path;
+            update();
+          }
+        },
+      ),
+      FileFieldItem(
+        fieldKey: 'video_document_key',
+        fieldLabel: 'Video Document'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '10MB',
+        allowedFileTypes: ['pdf','docx', 'doc'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx','doc'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.otherDocument = files[0].path;
+            update();
+          }
+        },
+      ),
+    ];
     fetchRequestDetail();
   }
 
   /// 提交
   void doSubmit() async {
-    Log.d("labour_review controller 提交");
+    Log.d("labour_req controller 提交");
 
     var needNumController = state.formData['no_of_staff']!['controller'];
     var amountController = state.formData['amount']!['controller'];
@@ -147,6 +286,9 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
     String totalCost = totalCostController.text.toString();
     String remark = remarkController.text.toString();
 
+    var videoTextController = state.formData['video_text']!['controller'];
+    String videoText = videoTextController.text.toString();
+
     // Log.d("89328392  ${state.selectedTypeId}");
     // Log.d("89328392  ${state.selectedTypeId.runtimeType}");
     if (Utils.isEmpty(state.selectedTemplateId)) {
@@ -195,13 +337,18 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
         "position": position,
         "estCost": totalCost,
         "attUrl": state.attFilePath,
+        "videoText": videoText,
+        "videoCover": state.videoCover,
+        "video": state.video,
+        "otherImage": state.otherImage,
+        "otherDocument": state.otherDocument,
         'cancelToken': cancelToken
       };
       // Log.d("编辑时 state.selectedCertificateList  ${state.selectedCertificateList}");
       // Log.d("编辑时 state.selectedCertificateList  ${state.selectedCertificateList.join(",")}");
       // Log.d("编辑时 state.selectedVehicleList  ${state.selectedVehicleList.join(",")}");
       //
-      // Log.d("编辑时准备提交的 params  ${params}");
+      Log.d("编辑时准备提交的 params  ${params}");
       // 编辑
       taskFuture = _ukLabourRepository.editLabourRequestSubmit(
         requestId: params['requestId'],
@@ -224,6 +371,11 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
         position: params['position'],
         estCost: params['estCost'],
         attUrl: params['attUrl'],
+        videoText: params['videoText'],
+        videoCover: params['videoCover'],
+        video: params['video'],
+        otherImage: params['otherImage'],
+        otherDocument: params['otherDocument'],
         cancelToken: params['cancelToken'],
       );
     } else {
@@ -250,9 +402,14 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
         "position": position,
         "estCost": totalCost,
         "attUrl": state.attFilePath,
+        "videoText": videoText,
+        "videoCover": state.videoCover,
+        "video": state.video,
+        "otherImage": state.otherImage,
+        "otherDocument": state.otherDocument,
         'cancelToken': cancelToken,
       };
-      // Log.d("新增时准备提交的 params  ${params}");
+      Log.d("新增时准备提交的 params  ${params}");
       // 新增
       taskFuture = _ukLabourRepository.addLabourRequestSubmit(
         templateId: params['templateId'],
@@ -277,6 +434,11 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
         position: params['position'],
         estCost: params['estCost'],
         attUrl: params['attUrl'],
+        videoText: params['videoText'],
+        videoCover: params['videoCover'],
+        video: params['video'],
+        otherImage: params['otherImage'],
+        otherDocument: params['otherDocument'],
         cancelToken: params['cancelToken'],
       );
     }
@@ -346,6 +508,7 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
     final result = await _ukLabourRepository.fetchLabourRequestShowTemplateData(templateId);
     if (result.isSuccess) {
       state.showTemplateData = result.data;
+
       if (state.showTemplateData != null) {
         // 回显 证书、vehicle
         if((state.showTemplateData?.certificate??'').isNotEmpty){
@@ -372,10 +535,21 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
             }
           });
 
-
           Log.d("切换模板后, 需要回显的vehicle列表: ${state.selectedVehicleList}");
           Log.d("切换模板后, 证书的回显 vehicleList: ${state.labReqOption?.vehicleList}");
 
+          // 回显chanllege25
+          state.selectedChallenge25Id = state.showTemplateData?.challenge25.toString();
+          state.labReqOption?.challenge25List?.forEach((e)=> {
+            if(state.selectedChallenge25Id == e.value.toString()){
+              e.checked = 'checked'
+            }else {
+              e.checked = ''
+            }
+          });
+          Log.d("切换模板后, 需要回显的challenge25列表: ${state.challenge25List}");
+          Log.d("切换模板后, 证书的回显 vehicleList: ${state.labReqOption?.challenge25List}");
+
         }
         // 更新
         update();

packages/cpt_uk/lib/modules/job/labour_request_add/labour_request_add_state.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
 import 'package:cpt_uk/modules/job/labour_request_add/widget/labour_request_interface.dart';
+import 'package:cpt_uk/modules/job/labour_request_add/widget/uploadFileField.dart';
 import 'package:domain/entity/response/uk_lab_req_show_template_entity.dart';
 import 'package:domain/entity/response/uk_labour_request_detail_entity.dart';
-import 'package:domain/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
+import 'package:domain/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:shared/utils/date_time_utils.dart';
@@ -41,7 +42,7 @@ class LabourRequestAddState implements CommonLabourRequestState {
 
   String? preSelectedNames; // 预选人姓名
   String? preSelectedIds; // 预选人ids
-  List<UkLabourRequestPreselectAddstatffListRows>? preSelectedList = []; // 预选人列表
+  List<UkLabourRequestPreselectAddstaffListRows>? preSelectedList = []; // 预选人列表
 
   UkLabReqShowTemplateEntity? showTemplateData; // 切换模板时 获取的回显的部分数据（证书、chanllenge25、vehicle）
 
@@ -62,6 +63,7 @@ class LabourRequestAddState implements CommonLabourRequestState {
 
   String? chargeOptionId;
 
+  @override
   //表单的校验与数据
   Map<String, Map<String, dynamic>> formData = {
     'no_of_staff': {
@@ -127,16 +129,58 @@ class LabourRequestAddState implements CommonLabourRequestState {
       'hintText': 'Enter...'.tr,
       'obsecure': false,
     },
+    'video_text': {
+      'value': '',
+      'controller': TextEditingController(),
+      'focusNode': FocusNode(),
+      'hintText': 'Enter...'.tr,
+      'obsecure': false,
+    }
   };
 
+  @override
   int get serviceType => labReqOption?.serviceType ?? 0;
+
+  @override
   List<UkLabourRequestDetailLocationList>? get locationList => labReqOption?.locationList;
+  @override
   List<UkLabourRequestDetailTemplateList>? get templateList => labReqOption?.templateList;
+  @override
   List<UkLabourRequestDetailDepartmentList>? get departmentList => labReqOption?.departmentList;
+  @override
   List<UkLabourRequestDetailChargeList>? get chargeList => labReqOption?.chargeList;
+  @override
   List<UkLabourRequestDetailEmploymentList>? get employmentList => labReqOption?.employmentList;
+  @override
   List<UkLabourRequestDetailCertificateList>? get certificateList => labReqOption?.certificateList;
+  @override
   List<UkLabourRequestDetailVehicleList>? get vehicleList => labReqOption?.vehicleList;
+  @override
   List<UkLabourRequestDetailChallenge25List>? get challenge25List => labReqOption?.challenge25List;
 
+
+  @override
+  String? videoText;
+
+  @override
+  dynamic? videoCover;
+
+  @override
+  dynamic? video;
+
+  @override
+  dynamic? otherImage;
+
+  @override
+  dynamic? otherDocument;
+
+
+  @override
+  String videoTips = '''
+    Video - video type (eg: mp4) and size 20MB
+    Document can be word/pdf,etc and the size 10MB
+    Cover、Image can be jpg,jpeg,png and the size 10MB.
+    ''';
+  @override
+  List<FileFieldItem> uploadFieldList = [];
 }

packages/cpt_uk/lib/modules/job/labour_request_add/widget/lab_request_and_request_review_form.dart

@@ -1,3 +1,6 @@
+import 'dart:io';
+
+import 'package:cpt_uk/modules/job/labour_request_add/widget/uploadFileField.dart';
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/response/uk_labour_request_detail_entity.dart';
@@ -289,8 +292,8 @@ class CommonLabourRequestFormFields extends StatelessWidget {
           child: CustomCheckBox(
             options: state.certificateList?.map<String>((e) => e.txt!).toList() ?? [],
             onOptionsSelected: (selected) {
-              Log.d("操作了证书后的 selected   ${selected}");
-              Log.d("操作证书时的 state.certificateList   ${state.certificateList}");
+              Log.d("操作了证书选择的 index   ${selected}");
+              Log.d("操作证书前的 state.certificateList   ${state.certificateList}");
               // 转换选中的索引为对应的 value
               state.selectedCertificateList = selected
                   .map((index) {
@@ -298,7 +301,9 @@ class CommonLabourRequestFormFields extends StatelessWidget {
               })
                   .whereType<String>()
                   .toList();
-              Log.d("操作了证书后的 selectedList   ${state.selectedCertificateList}");
+              Log.d("操作了证书后的 selectedCertificateList   ${state.selectedCertificateList}");
+              Log.d("操作了证书后的 selectedVehicleList   ${state.selectedVehicleList}");
+
             },
             selectedOptions: state.certificateList?.where((e) => e.checked == "checked").map((e) => e.txt!).toList() ?? [],
           ).marginOnly(left: 0, right: 15, top: 10),
@@ -323,7 +328,7 @@ class CommonLabourRequestFormFields extends StatelessWidget {
               },
               selectedPosition: state.challenge25List?.indexWhere((e) => e.checked == "checked") ?? -1,
           ).marginOnly(left: 0, right: 15, top: 10),
-    ),
+        ),
 
         // Vehicle  交通工具
         MyTextView(
@@ -340,6 +345,8 @@ class CommonLabourRequestFormFields extends StatelessWidget {
           child: CustomCheckBox(
             options: state.vehicleList?.map((e) => e.txt!).toList() ?? [],
             onOptionsSelected: (selected) {
+              Log.d("操作了交通工具选项的 index   ${selected}");
+              Log.d("操作交通工具前的 state.selectedCertificateList   ${state.certificateList}");
               // 转换选中的索引为对应的 value
               state.selectedVehicleList = selected
                   .map((index) {
@@ -347,6 +354,9 @@ class CommonLabourRequestFormFields extends StatelessWidget {
               })
                   .whereType<String>()
                   .toList();
+              Log.d("操作了交通工具后的 selectedVehicleList   ${state.selectedVehicleList}");
+              Log.d("操作了交通工具后的 selectedCertificateList   ${state.selectedCertificateList}");
+
             },
             selectedOptions: state.vehicleList?.where((e) => e.checked == "checked").map((e) => e.txt!).toList() ?? [],
           ).marginOnly(left: 0, right: 15, top: 10),
@@ -564,59 +574,14 @@ class CommonLabourRequestFormFields extends StatelessWidget {
           },
         ),
 
-        //输入Remark
-        MyTextView(
-          "Remark".tr,
-          fontSize: 15,
-          isFontRegular: true,
-          textColor: Colors.white,
-          marginTop: 15,
-        ),
-
-        IgnoreKeyboardDismiss(
-          child: Container(
-            height: 160,
-            margin: const EdgeInsets.only(top: 10),
-            padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 15),
-            decoration: BoxDecoration(
-              color: const Color(0xFF4DCFF6).withOpacity(isDetailAction == 2 ? 0.5 : 0.2),
-              borderRadius: const BorderRadius.all(Radius.circular(5)),
-            ),
-            child: TextField(
-              cursorColor: ColorConstants.white,
-              cursorWidth: 1.5,
-              autofocus: false,
-              enabled: isAddAction || isEditAction,
-              focusNode: state.formData["remark"]!['focusNode'],
-              controller: state.formData["remark"]!['controller'],
-              // 装饰
-              decoration: InputDecoration(
-                isDense: true,
-                isCollapsed: true,
-                border: InputBorder.none,
-                hintText: state.formData["remark"]!['hintText'],
-                hintStyle: const TextStyle(
-                  color: ColorConstants.textGrayAECAE5,
-                  fontSize: 15.0,
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
-              style: const TextStyle(
-                color: ColorConstants.white,
-                fontSize: 15.0,
-                fontWeight: FontWeight.w400,
-              ),
-              // 键盘动作右下角图标
-              textInputAction: TextInputAction.done,
-              onSubmitted: (value) {
-                FocusScope.of(context).unfocus();
-              },
-            ),
-          ),
-        ),
+          // //输入Remark
+          // _buildRemarkWidget(context, controller, isAddAction, isEditAction, isDetailAction),
 
         // 附件
-        _buildAttachFileWidget(context, controller, isAddAction, isEditAction, isDetailAction),
+        // _buildAttachFileWidget(context, controller, isAddAction, isEditAction, isDetailAction),
+
+        // 视频部分
+        _buildVideoSectionWidget(context, controller, isAddAction, isEditAction, isDetailAction),
 
         const SizedBox(height: 30),
 
@@ -933,6 +898,65 @@ class CommonLabourRequestFormFields extends StatelessWidget {
      );
   }
 
+  // remark
+  Widget _buildRemarkWidget(BuildContext context, CommonLabourRequestController controller,bool isAdd, bool isEdit, bool isDetail){
+    final state = controller.commonState;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MyTextView(
+          "Remark".tr,
+          fontSize: 15,
+          isFontRegular: true,
+          textColor: Colors.white,
+          marginTop: 15,
+        ),
+
+        IgnoreKeyboardDismiss(
+          child: Container(
+            height: 160,
+            margin: const EdgeInsets.only(top: 10),
+            padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 15),
+            decoration: BoxDecoration(
+              color: const Color(0xFF4DCFF6).withOpacity(isDetail == 2 ? 0.5 : 0.2),
+              borderRadius: const BorderRadius.all(Radius.circular(5)),
+            ),
+            child: TextField(
+              cursorColor: ColorConstants.white,
+              cursorWidth: 1.5,
+              autofocus: false,
+              enabled: isAdd || isEdit,
+              focusNode: state.formData["remark"]!['focusNode'],
+              controller: state.formData["remark"]!['controller'],
+              // 装饰
+              decoration: InputDecoration(
+                isDense: true,
+                isCollapsed: true,
+                border: InputBorder.none,
+                hintText: state.formData["remark"]!['hintText'],
+                hintStyle: const TextStyle(
+                  color: ColorConstants.textGrayAECAE5,
+                  fontSize: 15.0,
+                  fontWeight: FontWeight.w400,
+                ),
+              ),
+              style: const TextStyle(
+                color: ColorConstants.white,
+                fontSize: 15.0,
+                fontWeight: FontWeight.w400,
+              ),
+              // 键盘动作右下角图标
+              textInputAction: TextInputAction.done,
+              onSubmitted: (value) {
+                FocusScope.of(context).unfocus();
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
   // 附件
   Widget _buildAttachFileWidget(BuildContext context, CommonLabourRequestController controller,bool isAdd, bool isEdit, bool isDetail){
     final state = controller.commonState;
@@ -993,4 +1017,76 @@ class CommonLabourRequestFormFields extends StatelessWidget {
       ],
     );
   }
+
+  // 视频部分
+  Widget _buildVideoSectionWidget(BuildContext context, CommonLabourRequestController controller,bool isAdd, bool isEdit, bool isDetail){
+    final state = controller.commonState;
+    String videoTips = state.videoTips;
+    List<FileFieldItem> uploadFieldList = state.uploadFieldList;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MyTextView(
+          "Video".tr,
+          fontSize: 15,
+          isFontRegular: true,
+          textColor: Colors.white,
+          marginTop: 15,
+        ),
+        MyTextView(
+          "${videoTips}",
+          fontSize: 12,
+          isFontRegular: true,
+          textColor: Colors.white,
+          marginTop: 5,
+        ),
+
+        // video Text
+        Container(
+          child: Column(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              MyTextView(
+                "Video Text".tr,
+                fontSize: 15,
+                isFontRegular: true,
+                textColor: Colors.white,
+              ),
+
+              CustomTextField(
+                formKey: "video_text",
+                marginLeft: 0,
+                marginRight: 0,
+                paddingTop: 0,
+                paddingBottom: 0,
+                marginTop: 10,
+                height: 45,
+                fillBackgroundColor: const Color(0xFF4DCFF6).withOpacity(isDetail? 0.5 : 0.2),
+                enabled: !isDetail,
+                textInputType: TextInputType.text,
+                formData: state.formData,
+                textInputAction: TextInputAction.done,
+                onSubmit: (key, value) {
+                  FocusScope.of(context).unfocus();
+                },
+              ),
+            ],
+          ),
+        ),
+
+        for(int i =0; i< uploadFieldList.length; i++)
+          // video cover
+          _buildUploadFileWidget(context, controller,isAdd, isEdit, isDetail, uploadFieldList[i], i)
+
+      ]
+    );
+  }
+
+  // 上传文件widget
+  Widget _buildUploadFileWidget(BuildContext context, CommonLabourRequestController controller,bool isAdd, bool isEdit, bool isDetail, FileFieldItem fileField, int index){
+    return UploadFileField(
+        fileField: fileField,
+    );
+  }
 }

packages/cpt_uk/lib/modules/job/labour_request_add/widget/labour_request_interface.dart

@@ -1,3 +1,6 @@
+import 'dart:io';
+
+import 'package:cpt_uk/modules/job/labour_request_add/widget/uploadFileField.dart';
 import 'package:domain/entity/response/uk_labour_request_detail_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
@@ -30,6 +33,138 @@ abstract class CommonLabourRequestState {
   List<UkLabourRequestDetailDepartmentList>? get departmentList;
   List<UkLabourRequestDetailChargeList>? get chargeList;
   List<UkLabourRequestDetailEmploymentList>? get employmentList;
+
+  // 视频相关
+  String videoTips = '''
+    Video - video type (eg: mp4) and size 20MB
+    Document can be word/pdf,etc and the size 10MB
+    Cover、Image can be jpg,jpeg,png and the size 10MB.
+    ''';
+  List<FileFieldItem> uploadFieldList = [
+    FileFieldItem(
+      fieldKey: 'video_cover_key',
+      fieldLabel: 'Cover',
+      fieldPathValueList: [""],
+      fieldPlaceholder: "Choose".tr,
+      maxSize: '10MB',
+      allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+      multiple: false,
+      preview: false,
+      download: false, // 启用下载功能
+      disabled: false,
+      onFilesSelected: (List<File> files) {
+        // print("选中的文件: ${files}");
+        // print("选中的文件: ${files.length}个");
+      },
+      onFileRemoved: (file) {
+        print("文件已移除: ${file.path}");
+      },
+      onFilePreview: (file) {
+        // 自定义预览逻辑
+        print("预览文件: ${file.path}");
+      },
+      onFileDownload: (file) {
+        // 自定义下载逻辑
+        print("下载文件: ${file.path}");
+      },
+    ),
+    FileFieldItem(
+      fieldKey: 'video_video_key',
+      fieldLabel: 'Video',
+      fieldPathValueList: [""],
+      fieldPlaceholder: "Choose".tr,
+      maxSize: '20MB',
+      allowedFileTypes: ['mp4'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+      multiple: false,
+      preview: false,
+      download: false, // 启用下载功能
+      disabled: false,
+      onFilesSelected: (List<File> files) {
+        print("选中的文件: ${files}");
+        print("选中的文件: ${files.length}个");
+      },
+      onFileRemoved: (file) {
+        print("文件已移除: ${file.path}");
+      },
+      onFilePreview: (file) {
+        // 自定义预览逻辑
+        print("预览文件: ${file.path}");
+      },
+      onFileDownload: (file) {
+        // 自定义下载逻辑
+        print("下载文件: ${file.path}");
+        // 可以在这里集成实际的下载实现
+        // 例如使用 dio 下载文件到指定目录
+      },
+    ),
+    FileFieldItem(
+      fieldKey: 'video_image_key',
+      fieldLabel: 'Image',
+      fieldPathValueList: [""],
+      fieldPlaceholder: "Choose".tr,
+      maxSize: '10MB',
+      allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+      multiple: false,
+      preview: false,
+      download: false, // 启用下载功能
+      disabled: false,
+      onFilesSelected: (List<File> files) {
+        print("选中的文件: ${files}");
+        print("选中的文件: ${files.length}个");
+      },
+      onFileRemoved: (file) {
+        print("文件已移除: ${file.path}");
+      },
+      onFilePreview: (file) {
+        // 自定义预览逻辑
+        print("预览文件: ${file.path}");
+      },
+      onFileDownload: (file) {
+        // 自定义下载逻辑
+        print("下载文件: ${file.path}");
+        // 可以在这里集成实际的下载实现
+        // 例如使用 dio 下载文件到指定目录
+      },
+    ),
+    FileFieldItem(
+      fieldKey: 'video_document_key',
+      fieldLabel: 'Document',
+      fieldPathValueList: [""],
+      fieldPlaceholder: "Choose".tr,
+      maxSize: '10MB',
+      allowedFileTypes: ['pdf','docx', 'doc'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx','doc'
+      multiple: false,
+      preview: false,
+      download: false, // 启用下载功能
+      disabled: false,
+      onFilesSelected: (List<File> files) {
+        print("选中的文件: ${files}");
+        print("选中的文件: ${files.length}个");
+      },
+      onFileRemoved: (file) {
+        print("文件已移除: ${file.path}");
+      },
+      onFilePreview: (file) {
+        // 自定义预览逻辑
+        print("预览文件: ${file.path}");
+      },
+      onFileDownload: (file) {
+        // 自定义下载逻辑
+        print("下载文件: ${file.path}");
+        // 可以在这里集成实际的下载实现
+        // 例如使用 dio 下载文件到指定目录
+      },
+    ),
+  ];
+
+  String? videoText;
+  dynamic? videoCover;
+  dynamic? video;
+  dynamic? otherImage;
+  dynamic? otherDocument;
+
+
+
   List<UkLabourRequestDetailCertificateList>? get certificateList => labReqOption?.certificateList;
   List<UkLabourRequestDetailVehicleList>? get vehicleList => labReqOption?.vehicleList;
   List<UkLabourRequestDetailChallenge25List>? get challenge25List => labReqOption?.challenge25List;
@@ -99,6 +234,13 @@ abstract class CommonLabourRequestState {
       'hintText': 'Enter...'.tr,
       'obsecure': false,
     },
+    'video_text': {
+      'value': '',
+      'controller': TextEditingController(),
+      'focusNode': FocusNode(),
+      'hintText': 'Enter...'.tr,
+      'obsecure': false,
+    }
   };
 }
 

packages/cpt_uk/lib/modules/job/labour_request_add/widget/uploadFileField.dart

@@ -0,0 +1,440 @@
+// uploadFileField.dart
+import 'dart:io';
+import 'package:cs_resources/constants/color_constants.dart';
+import 'package:flutter/material.dart';
+import 'package:plugin_basic/basic_export.dart';
+import 'package:plugin_platform/engine/toast/toast_engine.dart';
+import 'package:shared/utils/log_utils.dart';
+import 'package:shared/utils/util.dart';
+import 'package:widgets/ext/ex_widget.dart';
+import 'package:widgets/my_text_view.dart';
+import 'package:file_picker/file_picker.dart';
+
+class FileFieldItem {
+  final String fieldKey; // 字段key
+  final String? fieldLabel; // 文件字段名称
+  late List<String>? fieldPathValueList; // 文件字段值
+  final String? fieldPlaceholder; // 文件字段提示
+  final String? maxSize; // 文件大小限制 如 '500B' '1KB' ‘1MB’
+  final bool multiple; // 是否允许多文件上传
+  final bool canUpload; // 是否可上传
+  final bool disabled; // 是否禁用
+  final bool preview; // 是否可以点击预览
+  final bool download; // 是否可以下载
+  final List<String> allowedFileTypes; // 允许的文件类型
+  final Function(List<File>)? onFilesSelected; // 文件选择回调
+  final Function(File)? onFileRemoved; // 文件删除回调
+  final Function(File)? onFilePreview; // 文件预览回调
+  final Function(File)? onFileDownload; // 文件下载回调
+
+  FileFieldItem({
+    required this.fieldKey,
+    this.fieldLabel,
+    fieldPathValueList,
+    fieldPlaceholder,
+    this.maxSize,
+    multiple,
+    canUpload,
+    disabled,
+    preview,
+    download, // 默认不启用下载
+    allowedFileTypes,
+    this.onFilesSelected,
+    this.onFileRemoved,
+    this.onFilePreview,
+    this.onFileDownload,
+  }): this.fieldPathValueList = fieldPathValueList!=null?fieldPathValueList?.cast<String>()?? []: null,
+      this.fieldPlaceholder = fieldPlaceholder?? 'Choose File',
+      this.canUpload = canUpload?? true,
+      this.multiple = multiple?? false,
+      this.disabled = disabled?? false,
+      this.preview = preview?? false,
+      this.download = download?? false,
+      this.allowedFileTypes = allowedFileTypes ?? ['*'];
+}
+
+class UploadFileField extends StatefulWidget {
+  final FileFieldItem fileField;
+
+  const UploadFileField({
+    Key? key,
+    required this.fileField,
+  }) : super(key: key);
+
+  @override
+  _UploadFileFieldState createState() => _UploadFileFieldState();
+}
+
+class _UploadFileFieldState extends State<UploadFileField> {
+  String? _filedInputText;
+  List<File> _selectedFiles = [];
+  String? _errorMessage;
+
+  @override
+  void initState() {
+    super.initState();
+
+    if(widget.fileField.multiple){
+      // 多选
+      if(widget.fileField.fieldPathValueList!=null && widget.fileField.fieldPathValueList!.isNotEmpty){
+        _filedInputText = widget.fileField.fieldPathValueList!.map((url) {
+          if(url.isEmpty) return '';
+          try {
+            return Uri.parse(url).pathSegments.last;
+          } catch (e) {
+            return '';
+          }
+        }).where((element) => element.isNotEmpty).join(",");
+      }
+    }else {
+      // 单选
+      if (widget.fileField.fieldPathValueList != null &&
+          widget.fileField.fieldPathValueList!.isNotEmpty) {
+        try {
+          String firstUrl = widget.fileField.fieldPathValueList!.first;
+          if (firstUrl.isNotEmpty) {
+            _filedInputText = Uri.parse(firstUrl).pathSegments.last;
+          } else {
+            _filedInputText = "";
+          }
+        } catch (e) {
+          _filedInputText = "";
+        }
+      } else {
+        _filedInputText = "";
+      }
+    }
+  }
+
+  // 将大小字符串转换为字节 B
+  int _parseSizeToBytes(String maxSize) {
+    final RegExp regex = RegExp(r'(\d+)([KMGT]?B)', caseSensitive: false);
+    final match = regex.firstMatch(maxSize.toUpperCase());
+
+    if (match == null) return 0;
+
+    final number = int.parse(match.group(1)!);
+    final unit = match.group(2);
+
+    switch (unit) {
+      case 'KB':
+        return number * 1024;
+      case 'MB':
+        return number * 1024 * 1024;
+      case 'GB':
+        return number * 1024 * 1024 * 1024;
+      case 'TB':
+        return number * 1024 * 1024 * 1024 * 1024;
+      default:
+        return number;
+    }
+  }
+
+  void _pickFiles() async {
+    if (widget.fileField.disabled) return;
+
+    try {
+      FilePickerResult? result = await FilePicker.platform.pickFiles(
+        allowMultiple: widget.fileField.multiple,
+        type: FileType.custom,
+        //   allowedExtensions: widget.fileField.allowedFileTypes,
+        allowedExtensions: ['jpg', 'png', 'jpeg', 'pdf', 'docx','mp4'],
+      );
+
+      Log.d("--选取的文件结果----  ${result}");
+      if (result != null) {
+        if(!widget.fileField.multiple){
+          // 清空上次_selectedFiles
+          _selectedFiles = [];
+        }
+
+        List<PlatformFile> files = result.files;
+        _validateAndSetFiles(files);
+      }
+
+    } catch (e) {
+      setState(() {
+        _errorMessage = '文件选择失败';
+      });
+    }
+  }
+
+  void _validateAndSetFiles(List<PlatformFile> platFormFiles) {
+    Log.d("开始验证和设置文件--${platFormFiles}-");
+    setState(() {
+      _errorMessage = null;
+    });
+
+    Log.d("验证文件大小和类型----${widget.fileField.multiple}---");
+    // 检查是否超过最大文件数量
+    if (!widget.fileField.multiple && (_selectedFiles.length + platFormFiles.length) > 1) {
+      setState(() {
+        _errorMessage = '只允许上传一个文件';
+      });
+      return;
+    }
+
+    Log.d("检查文件大小和类型---类型：${widget.fileField.allowedFileTypes}----大小限制：${widget.fileField.maxSize}-");
+
+    // 检查文件类型
+    if (!widget.fileField.allowedFileTypes.contains('*')) {
+      bool allowTypeRes = _checkAllowFileType(platFormFiles);
+      Log.d("允许文件类型结果--${allowTypeRes}");
+      if (!allowTypeRes) {
+        ToastEngine.show("${_errorMessage}");
+        return;
+      }
+    }
+
+    Log.d("所有文件类型验证通过");
+
+    // 检查文件大小
+    if(widget.fileField.maxSize != null){
+      Log.d("开始检查文件大小");
+      final maxSize = _parseSizeToBytes(widget.fileField.maxSize!);
+      Log.d("文件大小限制字节数：${maxSize} B");
+      bool isAlLowFileSizeRes = _checkAllowFileSize(platFormFiles, maxSize);
+      Log.d("所有文件大小验证结果--${isAlLowFileSizeRes}");
+      if(!isAlLowFileSizeRes){
+        return;
+      }
+    }
+
+    setState(() {
+      List<File> files = platFormFiles.map((file) {
+        return File(file.path!);
+      }).toList();
+      if (widget.fileField.multiple) {
+        _selectedFiles.addAll(files);
+      } else {
+        _selectedFiles = files.take(1).toList();
+      }
+    });
+
+    Log.d("当前选中的文件：$_selectedFiles");
+    if(widget.fileField.multiple && !widget.fileField.disabled){
+      setState(() {
+        _filedInputText = _selectedFiles.map((file) {
+          return Uri.parse(file.path).pathSegments.last;
+        }).join(",");
+      });
+    }else {
+      setState(() {
+        _filedInputText = Uri.parse(_selectedFiles.first.path).pathSegments.last;
+      });
+    }
+    widget.fileField.onFilesSelected?.call(_selectedFiles);
+  }
+
+  // 检查文件大小
+  bool _checkAllowFileSize(List<PlatformFile> platFormFiles, int maxSize){
+    for (var platFormFile in platFormFiles) {
+      // 检查文件大小
+      if (platFormFile.size > maxSize) {
+        setState(() {
+          _errorMessage = '文件大小超过限制 (${widget.fileField.maxSize})';
+        });
+        return false;
+      }
+    }
+    Log.d("文件大小检查通过---");
+    return true;
+  }
+
+  // 检查文件类型
+  bool _checkAllowFileType(List<PlatformFile> platFormFiles){
+    for (var platFormFile in platFormFiles) {
+      String filePath = platFormFile.path!;
+      String fileName = filePath.substring(filePath.lastIndexOf("/") + 1);
+      String fileSuffix = fileName.substring(fileName.lastIndexOf(".") + 1);
+      // 截取文件后缀进行判断
+      if (!widget.fileField.allowedFileTypes.contains(fileSuffix)) {
+        setState(() {
+          _errorMessage = "文件类型错误，请选择${widget.fileField.allowedFileTypes.join(",")}文件";
+        });
+        return false;
+      }
+    }
+    Log.d("文件类型检查通过---");
+    return true;
+  }
+
+  void _removeFile(File file) {
+    setState(() {
+      _selectedFiles.remove(file);
+      _errorMessage = null;
+    });
+    widget.fileField.onFileRemoved?.call(file);
+  }
+
+  void _previewFile(File file) {
+    if (!widget.fileField.preview || widget.fileField.disabled) return;
+
+    // 如果有自定义预览回调，使用回调
+    if (widget.fileField.onFilePreview != null) {
+      widget.fileField.onFilePreview!(file);
+      return;
+    }
+
+    // 默认预览行为 - 显示一个简单的预览对话框
+    _showDefaultPreview(file);
+  }
+
+  void _downloadFile(File file) {
+    if (!widget.fileField.download || widget.fileField.disabled) return;
+
+    // 如果有自定义下载回调，使用回调
+    if (widget.fileField.onFileDownload != null) {
+      widget.fileField.onFileDownload!(file);
+      return;
+    }
+
+    // 默认下载行为
+    _showDefaultDownload(file);
+  }
+
+  void _showDefaultPreview(File file) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(file.path.split('/').last),
+          content: SizedBox(
+            width: double.maxFinite,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.insert_drive_file, size: 60, color: Colors.blue),
+                const SizedBox(height: 16),
+                Text('文件路径: ${file.path}'),
+                Text('文件大小: ${(file.lengthSync() / 1024).toStringAsFixed(2)} KB'),
+              ],
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: const Text('关闭'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  void _showDefaultDownload(File file) {
+    // 下载
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     content: Text('开始下载文件: ${file.path.split('/').last}'),
+    //     duration: const Duration(seconds: 2),
+    //   ),
+    // );
+
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        //附件文件
+        MyTextView(
+          widget.fileField.fieldLabel??'-',
+          fontSize: 15,
+          isFontRegular: true,
+          textColor: Colors.white,
+          marginTop: 15,
+        ),
+
+        // 显示和选择附件
+        Container(
+          padding: const EdgeInsets.only(left: 16),
+          margin: const EdgeInsets.only(top: 10),
+          height: 45,
+          decoration: BoxDecoration(
+            color: const Color(0xFF4DCFF6).withOpacity(widget.fileField.disabled ? 0.5 : 0.2),
+            borderRadius: const BorderRadius.all(Radius.circular(5)),
+          ),
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              MyTextView(
+                '${_filedInputText}',
+                fontSize: 14,
+                hint: "Choose File".tr,
+                textHintColor: ColorConstants.textGrayAECAE5,
+                isFontMedium: true,
+                textColor: ColorConstants.white,
+              ).expanded(),
+
+              // 上传附件的图标
+              Visibility(
+                visible: widget.fileField.canUpload && !widget.fileField.disabled,
+                child: MyTextView(
+                  'Upload'.tr,
+                  boxHeight: 45,
+                  textAlign: TextAlign.center,
+                  boxWidth: 90,
+                  cornerRadius: 5,
+                  onClick: _pickFiles,
+                  textColor: Colors.white,
+                  fontSize: 15,
+                  fontWeight: FontWeight.w400,
+                  backgroundColor: ColorConstants.textGreen0AC074,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+
+  }
+
+  Widget _buildFileItem(File file) {
+    return Container(
+      margin: const EdgeInsets.only(bottom: 4),
+      child: Row(
+        children: [
+          const Icon(Icons.insert_drive_file, size: 16, color: Colors.blue),
+          const SizedBox(width: 8),
+          Expanded(
+            child: GestureDetector(
+              onTap: () => _previewFile(file),
+              child: Text(
+                file.path.split('/').last,
+                style: TextStyle(
+                  fontSize: 14,
+                  color: widget.fileField.preview && !widget.fileField.disabled
+                      ? Colors.blue
+                      : Colors.black,
+                  decoration: widget.fileField.preview && !widget.fileField.disabled
+                      ? TextDecoration.underline
+                      : TextDecoration.none,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          ),
+          if (widget.fileField.download && !widget.fileField.disabled)
+            IconButton(
+              icon: const Icon(Icons.download, size: 18, color: Colors.green),
+              onPressed: () => _downloadFile(file),
+              padding: const EdgeInsets.all(0),
+              constraints: const BoxConstraints(),
+            ),
+          if (!widget.fileField.disabled)
+            IconButton(
+              icon: const Icon(Icons.delete, size: 18, color: Colors.red),
+              onPressed: () => _removeFile(file),
+              padding: const EdgeInsets.all(0),
+              constraints: const BoxConstraints(),
+            ),
+        ],
+      ),
+    );
+  }
+}

packages/cpt_uk/lib/modules/job/labour_request_preselected_list/widget/preselected_add_staff.dart

@@ -2,7 +2,7 @@ import 'dart:ui';
 
 import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/response/job_list_applied_staff_search_entity.dart';
-import 'package:domain/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
+import 'package:domain/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -24,7 +24,7 @@ import 'preselected_add_staff_controller.dart';
 class PreselectedAddStaff extends StatefulWidget {
   String jobId;
   String? selectedStaffIds;
-  void Function(String selectIds, [List<UkLabourRequestPreselectAddstatffListRows>?])? confirmAction;
+  void Function(String selectIds, [List<UkLabourRequestPreselectAddstaffListRows>?])? confirmAction;
 
   PreselectedAddStaff({required this.jobId, this.selectedStaffIds, this.confirmAction});
 
@@ -142,7 +142,12 @@ class _PreselectedAddStaffState extends State<PreselectedAddStaff> {
                                 /// Item选中与未选中设置
                                 controller.datas[index].isSelected = !controller.datas[index].isSelected;
                                 controller.update();
-                              });
+                              },
+                                clickFavoriteCallback: () {
+                                  // 调用 打标的 接口
+                                  controller.handlerSetFavourite(controller.datas[index]);
+                                }
+                              );
                             },
                             childCount: controller.datas.length,
                           ))
@@ -224,7 +229,7 @@ class _PreselectedAddStaffState extends State<PreselectedAddStaff> {
 
   }
 
-  Widget _buildStaffItem(UkLabourRequestPreselectAddstatffListRows item, VoidCallback callback) {
+  Widget _buildStaffItem(UkLabourRequestPreselectAddstaffListRows item, VoidCallback callback, { VoidCallback? clickFavoriteCallback }) {
     return Stack(
       children: [
         Column(
@@ -335,6 +340,15 @@ class _PreselectedAddStaffState extends State<PreselectedAddStaff> {
           ],
         ).paddingOnly(left: 19, right: 20, top: 17),
 
+        //是否打标记的员工
+        MyAssetImage(
+          (item.isFavourite !=null && item.isFavourite == 1) ? Assets.baseServiceMarkActive : Assets.baseServiceMarkInactive,
+          width: 20,
+          height: 18.5,
+        ).alignRight().marginOnly(right: 55, top: 17.5).onTap((){
+          clickFavoriteCallback?.call();
+        }),
+
         //是否勾选
         MyAssetImage(
           item.isSelected ? Assets.baseServiceItemSelectedIcon : Assets.baseServiceItemUnselectedGrayIcon,

packages/cpt_uk/lib/modules/job/labour_request_preselected_list/widget/preselected_add_staff_controller.dart

@@ -1,9 +1,13 @@
 import 'package:domain/entity/response/job_list_applied_staff_search_entity.dart';
-import 'package:domain/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
+import 'package:domain/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
 import 'package:domain/repository/job_repository.dart';
+import 'package:domain/repository/uk_job_repository.dart';
 import 'package:domain/repository/uk_labour_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
+import 'package:plugin_platform/engine/loading/loading_engine.dart';
+import 'package:plugin_platform/engine/notify/notify_engine.dart';
+import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/load_state_layout.dart';
@@ -14,6 +18,7 @@ import 'package:widgets/widget_export.dart';
  */
 class PreselectedAddStaffController extends GetxController with DioCancelableMixin {
   final UkLabourRepository _labourRepository = Get.find();
+  final UKJobRepository _jobRepository = Get.find();
 
   TextEditingController searchController = TextEditingController();
 
@@ -26,7 +31,7 @@ class PreselectedAddStaffController extends GetxController with DioCancelableMix
 
   String keyword = "";
   String? jobId = null;
-  List<UkLabourRequestPreselectAddstatffListRows> datas = [];
+  List<UkLabourRequestPreselectAddstaffListRows> datas = [];
 
   //刷新页面状态
   void changeLoadingState(LoadState state) {
@@ -73,6 +78,7 @@ class PreselectedAddStaffController extends GetxController with DioCancelableMix
       cancelToken: cancelToken,
     );
 
+    // Log.d("获取到的数据 ${listResult.data}");
     // 处理数据
     if (listResult.isSuccess) {
       handleList(listResult.data?.rows);
@@ -86,7 +92,7 @@ class PreselectedAddStaffController extends GetxController with DioCancelableMix
   }
 
   // 处理数据与展示的逻辑
-  void handleList(List<UkLabourRequestPreselectAddstatffListRows>? list) {
+  void handleList(List<UkLabourRequestPreselectAddstaffListRows>? list) {
     if (list != null && list.isNotEmpty) {
       //有数据，判断是刷新还是加载更多的数据
       if (_curPage == 1) {
@@ -122,6 +128,27 @@ class PreselectedAddStaffController extends GetxController with DioCancelableMix
     refreshController.callRefresh();
   }
 
+  // 打标签
+  Future handlerSetFavourite(UkLabourRequestPreselectAddstaffListRows  data) async{
+    Log.d("点击前 isFavourite： ${data}");
+    String memberId = data.id!.toString();
+    String isFavourite = data.isFavourite?.toString()??"0";
+    String toFavourite = isFavourite == "0" ? "1" : "0";
+    Log.d("isFavourite需要设置成 ： ${toFavourite}");
+
+    LoadingEngine.show();
+    final result = await _jobRepository.staffSetFavourite(memberId, toFavourite);
+    if(result.isSuccess){
+      data.isFavourite = int.parse(toFavourite);
+      update();
+      LoadingEngine.dismiss();
+      NotifyEngine.showSuccess("Successful".tr);
+    }else {
+      LoadingEngine.dismiss();
+      ToastEngine.show(result.errorMsg ?? "Network Load Error".tr);
+    }
+  }
+
   @override
   void onReady() {
     super.onReady();

packages/cpt_uk/lib/modules/job/template_add/template_add_controller.dart

@@ -78,13 +78,15 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
     //处理数据
     if (result.isSuccess) {
       UkJobTemplateDetailBySelectTitleEntity? resultData = result.data;
+      Log.d("切换标题后 获取的数据 ${resultData}");
       // var templateNameController = state.formData['template_name']!['controller'];
+      var clientNameController = state.formData['client_name']!['controller'];
       var descController = state.formData['desc']!['controller'];
       var noteController = state.formData['note']!['controller'];
       var contactNameController = state.formData['contact_name']!['controller'];
       var contactNoController = state.formData['contact_no']!['controller'];
 
-
+      clientNameController.text = resultData?.client ?? "";
       descController.text = resultData?.requirements ?? "";
       noteController.text = resultData?.note ?? "";
       contactNameController.text = resultData?.contact ?? "";
@@ -98,14 +100,31 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
           .map((s) => int.tryParse(s) ?? 0)
           .toList();
 
-
       if (jobCertificateList.isNotEmpty) {
         state.indexOptionEntity?.certificateList?.forEach((cerItem) {
           if (jobCertificateList.contains(cerItem.value)) {
             cerItem.checked = "checked";
+          }else {
+            cerItem.checked = "";
           }
         });
       }
+      // 给 state.selectedCertificateList 赋值
+      _handlerCertificateEcho();
+
+      // challenge25 回显
+      state.selectedChallenge25Id = resultData?.challenge25?.toString()??'';
+      if(Utils.isNotEmpty(state.selectedChallenge25Id)){
+        state.indexOptionEntity?.challenge25List?.forEach((challenge25Item) {
+          if (state.selectedChallenge25Id == challenge25Item.value?.toString()) {
+            challenge25Item.checked = "checked";
+          }else {
+            challenge25Item.checked = "";
+          }
+        });
+      }
+      // 给 state.selectedChallenge25Id 赋值
+      _handlerChallenge25Echo();
 
       // 交通工具回显
       List<String> jobVechicleList = (resultData?.jobVehicle ?? '')
@@ -117,12 +136,12 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
         state.indexOptionEntity?.vehicleList?.forEach((vechicleItem) {
           if (jobVechicleList.contains(vechicleItem.value)) {
             vechicleItem.checked = "checked";
+          }else {
+            vechicleItem.checked = "";
           }
         });
       }
-
-      //回显
-      _handlerCertificateEcho();
+      // 给 state.selectedVehicleList 赋值
       _handlerVehicleEcho();
 
       //刷新
@@ -145,22 +164,24 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
         _fetchJobTitleOptionsList();
       }
 
+      var clientNameController = state.formData['client_name']!['controller'];
       var descController = state.formData['desc']!['controller'];
       var noteController = state.formData['note']!['controller'];
       var contactNameController = state.formData['contact_name']!['controller'];
       var contactNoController = state.formData['contact_no']!['controller'];
 
 
+      clientNameController.text = state.indexEntity?.row?.clientName ?? "";
       descController.text = state.indexEntity?.row?.description ?? "";
       noteController.text = state.indexEntity?.row?.note ?? "";
       contactNameController.text = state.indexEntity?.row?.contactName ?? "";
       contactNoController.text = state.indexEntity?.row?.contactNo ?? "";
 
-      Log.d("获取详情后的 state.selectedJobTemplateStr---- ${state.selectedJobTemplateStr}");
-
-      Log.d("获取详情后的 state.indexEntity?.row---- ${state.indexEntity?.row}");
-      Log.d("645646  ${state.selectedJobTitleStr}");
-      Log.d("89389   ${state.selectedJobTitleId}");
+      // Log.d("获取详情后的 state.selectedJobTemplateStr---- ${state.selectedJobTemplateStr}");
+      //
+      // Log.d("获取详情后的 state.indexEntity?.row---- ${state.indexEntity?.row}");
+      // Log.d("645646  ${state.selectedJobTitleStr}");
+      // Log.d("89389   ${state.selectedJobTitleId}");
       // 将 state.indexEntity?.certificateList  与 state.indexOptionEntity 进行对比 将 checked 复制给
       state.indexEntity?.certificateList?.forEach((e) {
         var option = state.indexOptionEntity?.certificateList?.firstWhere((option) => option.value == e.value, orElse: () => UkTemplateDetailIndexCertificateList());
@@ -169,6 +190,14 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
         }
       });
 
+      // 将state.indexEntity?.challenge25 与 state.index.OptionEntity 进行对比 修改对应checked
+      state.indexEntity?.challenge25List?.forEach((e) {
+        var option = state.indexOptionEntity?.challenge25List?.firstWhere((option) => option.value == e.value, orElse: () => UkTemplateDetailIndexChallenge25List());
+        if (option != null) {
+          option.checked = e.checked;
+        }
+      });
+
       // 将 state.indexEntity?.vehicleList  与 state.indexOptionEntity 进行对比 将 checked 复制给
       state.indexEntity?.vehicleList?.forEach((e) {
         var option = state.indexOptionEntity?.vehicleList?.firstWhere((option) => option.value == e.value, orElse: () => UkTemplateDetailIndexVehicleList());
@@ -178,6 +207,7 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
       });
 
       // 回显
+      _handlerChallenge25Echo();
       _handlerCertificateEcho();
       _handlerVehicleEcho();
 
@@ -195,16 +225,19 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
     if (result.isSuccess) {
       state.indexOptionEntity = result.data;
       state.selectedJobTemplateStr = state.indexEntity?.templateTitle ?? "";
+      var clientNameController = state.formData['client_name']!['controller'];
       var descController = state.formData['desc']!['controller'];
       var noteController = state.formData['note']!['controller'];
       var contactNameController = state.formData['contact_name']!['controller'];
       var contactNoController = state.formData['contact_no']!['controller'];
+      clientNameController.text =  "";
       descController.text =  "";
       noteController.text =  "";
       contactNameController.text =  "";
       contactNoController.text =  "";
 
       //回显
+      _handlerChallenge25Echo();
       _handlerCertificateEcho();
       _handlerVehicleEcho();
 
@@ -215,6 +248,17 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
     }
   }
 
+  // 回显 challenge25
+  void _handlerChallenge25Echo(){
+    //默认CheckBox
+    state.selectedChallenge25Id = state.indexOptionEntity?.challenge25List
+        ?.where((e) => e.checked == "checked")
+        .map((e) => e.value!.toString())
+        .toList()?.first ?? "";
+    Log.d("当前的challenge25： ${state.indexOptionEntity?.challenge25List}");
+    Log.d("当前选中的challenge25：${state.selectedChallenge25Id}");
+  }
+
   // 回显 certificate
   void _handlerCertificateEcho(){
     //默认CheckBox
@@ -234,7 +278,6 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
         .toList() ?? [];
     Log.d("当前的交通工具： ${state.indexOptionEntity?.vehicleList}");
     Log.d("当前选中的交通工具：${state.selectedVehicleList}");
-
   }
 
 
@@ -320,7 +363,9 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
 
   /// 提交
   void doSubmit() async {
+    Log.d("提交时  state.selectedCertificateList ${state.selectedCertificateList}");
 
+    var clientNameController = state.formData['client_name']!['controller'];
     var descController = state.formData['desc']!['controller'];
     var noteController = state.formData['note']!['controller'];
     var contactNameController = state.formData['contact_name']!['controller'];
@@ -330,6 +375,7 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
 
     String jobTemplate = state.selectedJobTemplateStr?? "";
     String jobTitle = state.selectedJobTitleStr??"";
+    String clientName = clientNameController.text.toString();
     String desc = descController.text.toString();
     String note = noteController.text.toString();
     String contactName = contactNameController.text.toString();
@@ -353,8 +399,10 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
         templateId: state.templateId?.toString()??'',
         jobTemplateId: state.selectedJobTitleId?.toString()??'',
         jobTitle: jobTitle,
+        clientName: clientName,
         certificate: state.selectedCertificateList,
         vehicle: state.selectedVehicleList,
+        challenge25: state.selectedChallenge25Id,
         desc: desc,
         note: note,
         contactName: contactName,
@@ -366,8 +414,10 @@ class TemplateAddController extends GetxController with DioCancelableMixin {
       taskFuture = _labourRepository.addJobTemplateSubmit(
         jobTemplateId: state.selectedJobTitleId?.toString()??'',
         jobTitle: state.selectedJobTitleStr?? '',
+        clientName: clientName,
         certificate: state.selectedCertificateList,
         vehicle: state.selectedVehicleList,
+        challenge25: state.selectedChallenge25Id,
         desc: desc,
         note: note,
         contactName: contactName,

packages/cpt_uk/lib/modules/job/template_add/template_add_page.dart

@@ -14,6 +14,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/no_shadow_scroll_behavior.dart';
 import 'package:widgets/shatter/custom_check_box.dart';
+import 'package:widgets/shatter/custom_radio_check.dart';
 import 'package:widgets/shatter/form_require_text.dart';
 import 'package:widgets/shatter/round_my_text_field.dart';
 import 'package:widgets/widget_export.dart';
@@ -102,32 +103,24 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-
+                          // 模板
                           _buildTemplateSelectWidget(),
+                          // 工作标题
                           _buildTemplateJobTitleWidget(),
 
-                          // if(isEdit)
-                          //   //模板名称
-                          //   ...[
-                          //     FormRequireText(text: "Template Title".tr).marginOnly(left: 15, top: 19),
-                          //     CustomTextField(
-                          //       formKey: "template_name",
-                          //       formData: state.formData,
-                          //       height: 46,
-                          //       fontSize: 14,
-                          //       enabled: isAdd ? true:false,
-                          //       onSubmit: (key, value) {
-                          //         state.formData[key]!['focusNode'].unfocus();
-                          //         FocusScope.of(context).requestFocus(state.formData['desc']!['focusNode']);
-                          //       },
-                          //       marginTop: 10,
-                          //     )
-                          //   ],
-                          // if(isAdd)
-                          //   ...[
-                          //     _buildTemplateSelectWidget(),
-                          //     _buildTemplateJobTitleWidget(),
-                          //   ],
+                          // 名称
+                          FormRequireText(text: "Name".tr, isRequired: false,).marginOnly(left: 15, top: 19),
+                          CustomTextField(
+                            formKey: "client_name",
+                            formData: state.formData,
+                            height: 46,
+                            fontSize: 14,
+                            onSubmit: (key, value) {
+                              state.formData[key]!['focusNode'].unfocus();
+                              FocusScope.of(context).requestFocus(state.formData['contact_name']!['focusNode']);
+                            },
+                            marginTop: 10,
+                          ),
 
 
                           //证书
@@ -152,15 +145,39 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
                                 // 转换选中的索引为对应的 value
                                 state.selectedCertificateList = selected
                                     .map((index) {
-                                      return state.indexOptionEntity?.certificateList?[index].value; // 获取对应的 value
+                                      return state.indexOptionEntity?.certificateList?[index].value?.toString(); // 获取对应的 value
                                     })
                                     .whereType<String>()
                                     .toList();
+                                // Log.d("选择的证书  ${state.selectedCertificateList}");
+
                               },
                               selectedOptions: state.indexOptionEntity?.certificateList?.where((e) => e.checked == "checked").map((e) => e.txt!).toList() ?? [],
                             ).marginOnly(left: 15, right: 15, top: 10),
                           ),
 
+
+                          // challenge25
+                          MyTextView(
+                            "Challenge25".tr,
+                            textColor: Colors.white,
+                            fontSize: 14,
+                            isFontRegular: true,
+                            marginLeft: 15,
+                            marginTop: 15,
+                          ),
+
+                          // challenge25 radiobox
+                          Visibility(
+                            child: CustomRadioCheck(
+                              options: state.indexOptionEntity?.challenge25List?.map((e) => e.txt!).toList() ?? [],
+                              onOptionSelected: (index, text) {
+                                state.selectedChallenge25Id = state.indexOptionEntity?.challenge25List![index].value?.toString()??'';
+                              },
+                              selectedPosition: state.indexOptionEntity?.challenge25List?.indexWhere((e) => e.checked == "checked") ?? -1,
+                            ).marginOnly(left: 15, right: 15, top: 10),
+                          ),
+
                           // 交通工具
                           MyTextView(
                             "Vehicle".tr,
@@ -180,10 +197,11 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
                                 // 转换选中的索引为对应的 value
                                 state.selectedVehicleList = selected
                                     .map((index) {
-                                  return state.indexOptionEntity?.vehicleList?[index].value; // 获取对应的 value
+                                  return state.indexOptionEntity?.vehicleList?[index].value?.toString(); // 获取对应的 value
                                 })
                                     .whereType<String>()
                                     .toList();
+                                // Log.d("选择的车辆  ${state.selectedVehicleList}");
                               },
                               selectedOptions: state.indexOptionEntity?.vehicleList?.where((e) => e.checked == "checked").map((e) => e.txt!).toList() ?? [],
                             ).marginOnly(left: 15, right: 15, top: 10),
@@ -380,7 +398,7 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           // template 模板
-          FormRequireText(text: "Template".tr).marginOnly(top: 15),
+          FormRequireText(text: "Industry".tr).marginOnly(top: 15),
           //选择template
           Container(
             padding: const EdgeInsets.only(left: 16, right: 10),
@@ -456,4 +474,5 @@ class _LabourTemplateAddState extends BaseState<UKTemplateAddPage, TemplateAddCo
       ),
     );
   }
+
 }

packages/cpt_uk/lib/modules/job/template_add/template_add_state.dart

@@ -15,6 +15,13 @@ class LabourTemplateAddState {
       'hintText': 'Enter...'.tr,
       'obsecure': false,
     },
+    'client_name': {
+      'value': '',
+      'controller': TextEditingController(),
+      'focusNode': FocusNode(),
+      'hintText': 'Enter...'.tr,
+      'obsecure': false,
+    },
     'contact_name': {
       'value': '',
       'controller': TextEditingController(),
@@ -70,4 +77,5 @@ class LabourTemplateAddState {
 
   List<String> selectedCertificateList = [];   //选中的 age 的 id
   List<String> selectedVehicleList = [];   //选中的 language 的 id
+  String? selectedChallenge25Id; // 选中的 challenge25 的 id
 }

packages/cpt_uk/lib/modules/job/template_list/item_template.dart

@@ -1,19 +1,21 @@
 import 'package:cs_resources/constants/color_constants.dart';
-import 'package:domain/entity/response/u_k_template_entity.dart';
+import 'package:domain/entity/response/uk_template_table_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:plugin_basic/basic_export.dart';
+import 'package:shared/utils/util.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/shatter/custom_radio_check.dart';
 
 /*
  * 用工请求的主页面列表Item
  */
 class TemplateItem extends StatelessWidget {
   final int index;
-  final UKTemplateRows item;
+  final UkTemplateTableRows item;
   final VoidCallback? onDeleteAction;
   final VoidCallback? onEditAction;
 
@@ -49,7 +51,7 @@ class TemplateItem extends StatelessWidget {
                 fontSize: 14,
               ),
               MyTextView(
-                item.jobTitle ?? "-",
+                "${item.jobTitle} ${Utils.isNotEmpty(item.clientName)? '-${item.clientName}':''}",
                 marginLeft: 5,
                 isFontMedium: true,
                 textColor: Colors.white,
@@ -104,6 +106,7 @@ class TemplateItem extends StatelessWidget {
             ],
           ).marginOnly(top: 14),
 
+
           // 联系人
           Row(
             mainAxisSize: MainAxisSize.max,

packages/cpt_uk/lib/modules/job/template_list/template_list_controller.dart

@@ -1,5 +1,5 @@
-import 'package:domain/entity/response/job_template_s_g_entity.dart';
-import 'package:domain/entity/response/u_k_template_entity.dart';
+
+import 'package:domain/entity/response/uk_template_table_entity.dart';
 import 'package:domain/repository/uk_job_repository.dart';
 import 'package:get/get.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
@@ -76,7 +76,7 @@ class TemplateListController extends GetxController with DioCancelableMixin {
   }
 
   // 处理数据与展示的逻辑
-  void handleList(List<UKTemplateRows>? list) {
+  void handleList(List<UkTemplateTableRows>? list) {
     if (list != null && list.isNotEmpty) {
       //有数据，判断是刷新还是加载更多的数据
       if (_curPage == 1) {
@@ -168,7 +168,7 @@ class TemplateListController extends GetxController with DioCancelableMixin {
   // 请求接口删除JobTitle
   void _requestDeactivate(int index) async {
     final item = state.datas[index];
-    var result = await _labourRepository.deleteJobTemplate(templateId: item.id, cancelToken: cancelToken);
+    var result = await _labourRepository.deleteJobTemplate(templateId: item.id.toString(), cancelToken: cancelToken);
 
     if (result.isSuccess) {
       NotifyEngine.showSuccess("Successful".tr);

packages/cpt_uk/lib/modules/job/template_list/template_list_state.dart

@@ -1,5 +1,5 @@
 import 'package:domain/entity/response/job_template_s_g_entity.dart';
-import 'package:domain/entity/response/u_k_template_entity.dart';
+import 'package:domain/entity/response/uk_template_table_entity.dart';
 import 'package:flutter/material.dart';
 
 class TemplateListState {
@@ -9,6 +9,6 @@ class TemplateListState {
   String keyword = "";
 
   //页面的列表数据
-  List<UKTemplateRows> datas = [];
+  List<UkTemplateTableRows> datas = [];
 
 }

packages/cpt_uk/lib/modules/review/labour_review_edit/labour_review_edit_controller.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cpt_uk/modules/job/labour_request_add/widget/labour_request_interface.dart';
 import 'package:cpt_uk/modules/job/labour_request_preselected_list/widget/preselected_add_staff.dart';
 import 'package:cpt_uk/widget/date_range_picker_dialog.dart';
@@ -22,6 +24,7 @@ import 'package:widgets/picker/date_picker_util.dart';
 import 'package:widgets/picker/option_pick_util.dart';
 import 'package:file_picker/file_picker.dart';
 
+import '../../job/labour_request_add/widget/uploadFileField.dart';
 import 'labour_review_edit_state.dart';
 
 class LabourReviewEditController extends GetxController with DioCancelableMixin implements CommonLabourRequestController {
@@ -60,6 +63,51 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
       state.jobSelectJobStart = state.labReqOption?.jobStart?? '';
       state.jobSelectJobEnd = state.labReqOption?.jobEnd?? '';
 
+      // 证书回显
+      state.labReqOption?.certificateList?.forEach((e)=> {
+        if(e.checked == 'checked'){
+          state.selectedCertificateList?.add(e.value.toString())
+        }
+      });
+      // 车辆回显
+      state.labReqOption?.vehicleList?.forEach((e)=> {
+        if(e.checked == 'checked'){
+          state.selectedVehicleList?.add(e.value.toString())
+        }
+      });
+
+      //回显 challenge25
+      // 遍历 state.challenge25List 中找到  checked 为  checked 的项
+      int? challenge25Index = state.labReqOption?.challenge25List?.indexWhere((e) => e.checked == "checked") ?? -1;
+      if (challenge25Index != -1) {
+        state.selectedChallenge25Id = state.labReqOption?.challenge25List?[challenge25Index].value.toString();
+      }
+
+      state.videoText = state.labReqOption?.videoText?? '';
+      state.videoCover = state.labReqOption?.videoCover?? '';
+      state.video = state.labReqOption?.video?? '';
+      state.otherImage = state.labReqOption?.otherImage?? '';
+      state.otherDocument = state.labReqOption?.otherDocument?? '';
+
+      // 修改 state.uploadFieldList 对应的 fieldPathValueList
+      state.uploadFieldList.forEach((element) {
+        if (element.fieldKey == 'video_cover_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.videoCover ?? '');
+        }
+        if (element.fieldKey == 'video_video_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.video ?? '');
+        }
+        if (element.fieldKey == 'video_image_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.otherImage ?? '');
+        }
+        if (element.fieldKey == 'video_document_key') {
+          element.fieldPathValueList?.clear();
+          element.fieldPathValueList?.add(state.otherDocument ?? '');
+        }
+      });
 
       if(state.pageType == 0){
         // 新增
@@ -96,6 +144,9 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
       //时薪还是房间计费
       state.chargeOptionId = state.labReqOption?.chargeList!.firstWhere((element) => element.checked == "checked").value;
 
+      var vidoeTextController = state.formData['video_text']!['controller'];
+      vidoeTextController.text = state.videoText??'';
+
       update();
     } else {
       ToastEngine.show(result.errorMsg ?? "Network Load Error".tr);
@@ -105,6 +156,85 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
   @override
   void onReady() {
     super.onReady();
+    state.uploadFieldList = [
+      FileFieldItem(
+          fieldKey: 'video_cover_key',
+          fieldLabel: 'Video Cover'.tr,
+          fieldPathValueList: [''],
+          fieldPlaceholder: "Choose".tr,
+          maxSize: '10MB',
+          allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+          multiple: false,
+          preview: false,
+          download: false, // 启用下载功能
+          disabled: false,
+          onFilesSelected: (List<File> files) {
+            print("选中的文件: ${files}");
+            // print("选中的文件: ${files.length}个");
+            if(files.length>0){
+              state.videoCover = files[0].path;
+              update();
+            }
+          }
+      ),
+      FileFieldItem(
+        fieldKey: 'video_video_key',
+        fieldLabel: 'Video'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '20MB',
+        allowedFileTypes: ['mp4'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.video = files[0].path;
+            update();
+          }
+        },
+      ),
+      FileFieldItem(
+        fieldKey: 'video_image_key',
+        fieldLabel: 'Video Image'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '10MB',
+        allowedFileTypes: ['jpg', 'png', 'jpeg'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.otherImage = files[0].path;
+            update();
+          }
+        },
+      ),
+      FileFieldItem(
+        fieldKey: 'video_document_key',
+        fieldLabel: 'Video Document'.tr,
+        fieldPathValueList: [''],
+        fieldPlaceholder: "Choose".tr,
+        maxSize: '10MB',
+        allowedFileTypes: ['pdf','docx', 'doc'],  // 'mp4', 'jpg', 'png', 'jpeg', 'pdf', 'docx','doc'
+        multiple: false,
+        preview: false,
+        download: false, // 启用下载功能
+        disabled: false,
+        onFilesSelected: (List<File> files) {
+          print("选中的文件: ${files}");
+          if(files.length>0){
+            state.otherDocument = files[0].path;
+            update();
+          }
+        },
+      ),
+    ];
     fetchRequestDetail();
   }
 
@@ -153,31 +283,44 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
       if (state.showTemplateData != null) {
         // 回显 证书、vehicle
         if((state.showTemplateData?.certificate??'').isNotEmpty){
-          List<String> selectedCertificateList = state.showTemplateData?.certificate?.split(',')?? [];
+          state.selectedCertificateList = state.showTemplateData?.certificate?.split(',')?? [];
           // 循环 state.labReqOption?.certificateList 满足条件修改  checked
           state.labReqOption?.certificateList?.forEach((e)=> {
-            if(selectedCertificateList.contains(e.value.toString())){
+            if(state.selectedCertificateList.contains(e.value.toString())){
               e.checked = 'checked'
             }else {
               e.checked = ''
             }
           });
-          Log.d("切换模板后, 需要回显的证书列表: ${selectedCertificateList}");
+
+          Log.d("切换模板后, 需要回显的证书列表: ${state.selectedCertificateList}");
           Log.d("切换模板后, 证书的回显 selectedCertificateList: ${state.labReqOption?.certificateList}");
 
-          List<String> selectedVehicleList = state.showTemplateData?.vehicle?.split(',')?? [];
+          state.selectedVehicleList = state.showTemplateData?.vehicle?.split(',')?? [];
           // 循环 state.labReqOption?.vehicleList 满足条件修改  checked
           state.labReqOption?.vehicleList?.forEach((e)=> {
-            if(selectedVehicleList.contains(e.value.toString())){
+            if(state.selectedVehicleList.contains(e.value.toString())){
               e.checked = 'checked'
             }else {
               e.checked = ''
             }
           });
 
-          Log.d("切换模板后, 需要回显的vehicle列表: ${selectedVehicleList}");
+          Log.d("切换模板后, 需要回显的vehicle列表: ${state.selectedVehicleList}");
           Log.d("切换模板后, 证书的回显 vehicleList: ${state.labReqOption?.vehicleList}");
 
+          // 回显chanllege25
+          state.selectedChallenge25Id = state.showTemplateData?.challenge25.toString();
+          state.labReqOption?.challenge25List?.forEach((e)=> {
+            if(state.selectedChallenge25Id == e.value.toString()){
+              e.checked = 'checked'
+            }else {
+              e.checked = ''
+            }
+          });
+          Log.d("切换模板后, 需要回显的challenge25列表: ${state.challenge25List}");
+          Log.d("切换模板后, 证书的回显 vehicleList: ${state.labReqOption?.challenge25List}");
+
         }
         // 更新
         update();
@@ -407,6 +550,8 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
     String totalCost = totalCostController.text.toString();
     String remark = remarkController.text.toString();
 
+    var videoTextController = state.formData['video_text']!['controller'];
+    String videoText = videoTextController.text.toString();
 
     if (Utils.isEmpty(state.selectedTemplateId)) {
       ToastEngine.show("Choose Job Title".tr);
@@ -433,7 +578,6 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
 
     Future<HttpResult> taskFuture;
     // 编辑
-
     Map<String, dynamic> params = {
       "requestId": state.requestId,
       "templateId": state.selectedTemplateId,
@@ -455,8 +599,14 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
       "position": position,
       "estCost": totalCost,
       "attUrl": state.attFilePath,
+      "videoText": videoText,
+      "videoCover": state.videoCover,
+      "video": state.video,
+      "otherImage": state.otherImage,
+      "otherDocument": state.otherDocument,
       'cancelToken': cancelToken
     };
+    Log.d("编辑时准备提交的 params  ${params}");
 
     // 调用的其实就是 lab-req 编辑的接口
     taskFuture = _ukLabourRepository.editLabourRequestReviewSubmit(
@@ -480,6 +630,11 @@ class LabourReviewEditController extends GetxController with DioCancelableMixin
       position: params['position'],
       estCost: params['estCost'],
       attUrl: params['attUrl'],
+      videoText: params['videoText'],
+      videoCover: params['videoCover'],
+      video: params['video'],
+      otherImage: params['otherImage'],
+      otherDocument: params['otherDocument'],
       cancelToken: params['cancelToken'],
     );
 

packages/cpt_uk/lib/modules/review/labour_review_edit/labour_review_edit_state.dart

@@ -8,6 +8,8 @@ import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:shared/utils/date_time_utils.dart';
 
+import '../../job/labour_request_add/widget/uploadFileField.dart';
+
 class LabourReviewEditState implements CommonLabourRequestState {
   @override
   String useInSence = 'labour_request_review';  // labour_request 、 labour_request_review
@@ -137,6 +139,37 @@ class LabourReviewEditState implements CommonLabourRequestState {
       'hintText': 'Enter...'.tr,
       'obsecure': false,
     },
+    'video_text': {
+      'value': '',
+      'controller': TextEditingController(),
+      'focusNode': FocusNode(),
+      'hintText': 'Enter...'.tr,
+      'obsecure': false,
+    }
   };
 
+  @override
+  String? videoText;
+
+  @override
+  dynamic? videoCover;
+
+  @override
+  dynamic? video;
+
+  @override
+  dynamic? otherImage;
+
+  @override
+  dynamic? otherDocument;
+
+  @override
+  String videoTips = '''
+    Video - video type (eg: mp4) and size 20MB
+    Document can be word/pdf,etc and the size 10MB
+    Cover、Image can be jpg,jpeg,png and the size 10MB.
+    ''';
+  @override
+  List<FileFieldItem> uploadFieldList = [];
+
 }

packages/cpt_uk/lib/widget/date_range_picker_dialog.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:shared/utils/date_time_utils.dart';
+import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
@@ -176,7 +177,8 @@ class _DateRangePickerDialogState extends State<DateRangePickerDialog> {
                       child: InkWell(
                         onTap: () async {
                           if (startDate != null && endDate != null) {
-                            if (endDate!.isBefore(startDate!.add(const Duration(hours: 6)))) {
+                            // 判断结束日期是否小于开始日期
+                            if (endDate!.isBefore(startDate!)) {
                               ToastEngine.show("End date must be greater than start date");
                             } else {
                               onCancel();
@@ -184,6 +186,14 @@ class _DateRangePickerDialogState extends State<DateRangePickerDialog> {
                               String dateRange = _getDateRange(startDate!, endDate!);
                               widget.confirmAction(dateRange);
                             }
+                            // if (endDate!.isBefore(startDate!.add(const Duration(hours: 6)))) {
+                            //   ToastEngine.show("End date must be greater than start date");
+                            // } else {
+                            //   onCancel();
+                            //   // 确保开始日期和结束日期都已选择
+                            //   String dateRange = _getDateRange(startDate!, endDate!);
+                            //   widget.confirmAction(dateRange);
+                            // }
                           } else {
                             ToastEngine.show("Select Date");
                           }

packages/cs_domain/lib/entity/response/u_k_template_entity.dart

@@ -1,49 +0,0 @@
-import 'package:domain/generated/json/base/json_field.dart';
-import 'package:domain/generated/json/u_k_template_entity.g.dart';
-import 'dart:convert';
-export 'package:domain/generated/json/u_k_template_entity.g.dart';
-
-@JsonSerializable()
-class UKTemplateEntity {
-	int total = 0;
-	List<UKTemplateRows> rows = [];
-
-	UKTemplateEntity();
-
-	factory UKTemplateEntity.fromJson(Map<String, dynamic> json) => $UKTemplateEntityFromJson(json);
-
-	Map<String, dynamic> toJson() => $UKTemplateEntityToJson(this);
-
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}
-
-@JsonSerializable()
-class UKTemplateRows {
-	String? id;
-	@JSONField(name: "job_title")
-	String? jobTitle;
-	String? vehicle;
-	String? certificate;
-	@JSONField(name: "contact_name")
-	String? contactName;
-	@JSONField(name: "contact_no")
-	String? contactNo;
-	@JSONField(name: "created_by")
-	String? createdBy;
-	@JSONField(name: "created_at")
-	String? createdAt;
-
-	UKTemplateRows();
-
-	factory UKTemplateRows.fromJson(Map<String, dynamic> json) => $UKTemplateRowsFromJson(json);
-
-	Map<String, dynamic> toJson() => $UKTemplateRowsToJson(this);
-
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}

packages/cs_domain/lib/entity/response/uk_job_template_detail_by_select_title_entity.dart

@@ -10,6 +10,7 @@ class UkJobTemplateDetailBySelectTitleEntity {
 	int? titleId;
 	String? title;
 	String? contact;
+	String? client;
 	@JSONField(name: "contact_no")
 	String? contactNo;
 	String? requirements;

packages/cs_domain/lib/entity/response/uk_lab_req_show_template_entity.dart

@@ -33,6 +33,10 @@ class UkLabReqShowTemplateEntity {
 	int? templateId;
 	@JSONField(name: "job_title_id")
 	int? jobTitleId;
+	@JSONField(name: "client_name")
+	String? clientName;
+	@JSONField(name: "challenge_25")
+	int? challenge25;
 
 	UkLabReqShowTemplateEntity();
 

packages/cs_domain/lib/entity/response/uk_labour_request_detail_entity.dart

@@ -30,20 +30,29 @@ class UkLabourRequestDetailEntity {
 	@JSONField(name: "employment_type")
 	int? employmentType;
 	@JSONField(name: "event_name")
-	dynamic eventName;
+	String? eventName;
 	@JSONField(name: "event_type")
-	dynamic eventType;
+	String? eventType;
 	int? passengers;
 	@JSONField(name: "est_revenue")
 	dynamic estRevenue;
 	String? position;
-	dynamic description;
+	String? description;
 	@JSONField(name: "att_url")
-	dynamic attUrl;
+	String? attUrl;
 	@JSONField(name: "est_cost")
 	String? estCost;
 	@JSONField(name: "est_ratio")
 	String? estRatio;
+	@JSONField(name: "video_text")
+	String? videoText;
+	@JSONField(name: "video_cover")
+	String? videoCover;
+	String? video;
+	@JSONField(name: "other_image")
+	String? otherImage;
+	@JSONField(name: "other_document")
+	String? otherDocument;
 	@JSONField(name: "certificate_list")
 	List<UkLabourRequestDetailCertificateList>? certificateList;
 	@JSONField(name: "vehicle_list")

packages/cs_domain/lib/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart

@@ -0,0 +1,49 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/uk_labour_request_preselect_addstaff_list_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/uk_labour_request_preselect_addstaff_list_entity.g.dart';
+
+@JsonSerializable()
+class UkLabourRequestPreselectAddstaffListEntity {
+	int? total;
+	List<UkLabourRequestPreselectAddstaffListRows>? rows;
+
+	UkLabourRequestPreselectAddstaffListEntity();
+
+	factory UkLabourRequestPreselectAddstaffListEntity.fromJson(Map<String, dynamic> json) => $UkLabourRequestPreselectAddstaffListEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkLabourRequestPreselectAddstaffListEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class UkLabourRequestPreselectAddstaffListRows {
+	int? id;
+	String? name;
+	@JSONField(name: "is_favourite")
+	int? isFavourite;
+	String? gender;
+	String? nric;
+	@JSONField(name: "profile_picture")
+	String? profilePicture;
+	int? status;
+	@JSONField(name: "apply_state")
+	int? applyState;
+
+	bool isSelected = false;
+
+	UkLabourRequestPreselectAddstaffListRows();
+
+	factory UkLabourRequestPreselectAddstaffListRows.fromJson(Map<String, dynamic> json) => $UkLabourRequestPreselectAddstaffListRowsFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkLabourRequestPreselectAddstaffListRowsToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}

packages/cs_domain/lib/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart

@@ -1,46 +0,0 @@
-import 'package:domain/generated/json/base/json_field.dart';
-import 'package:domain/generated/json/uk_labour_request_preselect_addstatff_list_entity.g.dart';
-import 'dart:convert';
-export 'package:domain/generated/json/uk_labour_request_preselect_addstatff_list_entity.g.dart';
-
-@JsonSerializable()
-class UkLabourRequestPreselectAddstatffListEntity {
-	int? total;
-	List<UkLabourRequestPreselectAddstatffListRows>? rows;
-
-	UkLabourRequestPreselectAddstatffListEntity();
-
-	factory UkLabourRequestPreselectAddstatffListEntity.fromJson(Map<String, dynamic> json) => $UkLabourRequestPreselectAddstatffListEntityFromJson(json);
-
-	Map<String, dynamic> toJson() => $UkLabourRequestPreselectAddstatffListEntityToJson(this);
-
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}
-
-@JsonSerializable()
-class UkLabourRequestPreselectAddstatffListRows {
-	int? id;
-	String? name;
-	String? gender;
-	String? nric;
-	@JSONField(name: "profile_picture")
-	String? profilePicture;
-	int? status;
-	@JSONField(name: "apply_state")
-	int? applyState;
-	bool isSelected = false;
-
-	UkLabourRequestPreselectAddstatffListRows();
-
-	factory UkLabourRequestPreselectAddstatffListRows.fromJson(Map<String, dynamic> json) => $UkLabourRequestPreselectAddstatffListRowsFromJson(json);
-
-	Map<String, dynamic> toJson() => $UkLabourRequestPreselectAddstatffListRowsToJson(this);
-
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}

packages/cs_domain/lib/entity/response/uk_template_detail_entity.dart

@@ -18,6 +18,8 @@ class UkTemplateDetailEntity {
 	List<UkTemplateDetailCertificateList>? certificateList;
 	@JSONField(name: "vehicle_list")
 	List<UkTemplateDetailVehicleList>? vehicleList;
+	@JSONField(name: "challenge_25_list")
+	List<UkTemplateDetailChallenge25List>? challenge25List;
 
 	UkTemplateDetailEntity();
 
@@ -61,6 +63,10 @@ class UkTemplateDetailRow {
 	int? templateId;
 	@JSONField(name: "job_title_id")
 	int? jobTitleId;
+	@JSONField(name: "client_name")
+	String? clientName;
+	@JSONField(name: "challenge_25")
+	int? challenge25;
 
 	UkTemplateDetailRow();
 
@@ -126,4 +132,22 @@ class UkTemplateDetailVehicleList {
 	String toString() {
 		return jsonEncode(this);
 	}
+}
+
+@JsonSerializable()
+class UkTemplateDetailChallenge25List {
+	int? value;
+	String? txt;
+	String? checked;
+
+	UkTemplateDetailChallenge25List();
+
+	factory UkTemplateDetailChallenge25List.fromJson(Map<String, dynamic> json) => $UkTemplateDetailChallenge25ListFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkTemplateDetailChallenge25ListToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
 }

packages/cs_domain/lib/entity/response/uk_template_detail_index_entity.dart

@@ -11,6 +11,8 @@ class UkTemplateDetailIndexEntity {
 	List<UkTemplateDetailIndexCertificateList>? certificateList;
 	@JSONField(name: "vehicle_list")
 	List<UkTemplateDetailIndexVehicleList>? vehicleList;
+	@JSONField(name: "challenge_25_list")
+	List<UkTemplateDetailIndexChallenge25List>? challenge25List;
 
 	UkTemplateDetailIndexEntity();
 
@@ -58,4 +60,22 @@ class UkTemplateDetailIndexVehicleList {
 	String toString() {
 		return jsonEncode(this);
 	}
+}
+
+@JsonSerializable()
+class UkTemplateDetailIndexChallenge25List {
+	int? value;
+	String? txt;
+	String? checked;
+
+	UkTemplateDetailIndexChallenge25List();
+
+	factory UkTemplateDetailIndexChallenge25List.fromJson(Map<String, dynamic> json) => $UkTemplateDetailIndexChallenge25ListFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkTemplateDetailIndexChallenge25ListToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
 }

packages/cs_domain/lib/entity/response/uk_template_table_entity.dart

@@ -0,0 +1,53 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/uk_template_table_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/uk_template_table_entity.g.dart';
+
+@JsonSerializable()
+class UkTemplateTableEntity {
+	int? total;
+	List<UkTemplateTableRows>? rows;
+
+	UkTemplateTableEntity();
+
+	factory UkTemplateTableEntity.fromJson(Map<String, dynamic> json) => $UkTemplateTableEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkTemplateTableEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class UkTemplateTableRows {
+	int? id;
+	@JSONField(name: "job_title")
+	String? jobTitle;
+	@JSONField(name: "client_name")
+	String? clientName;
+	@JSONField(name: "contact_name")
+	String? contactName;
+	@JSONField(name: "contact_no")
+	String? contactNo;
+	@JSONField(name: "challenge_25")
+	String? challenge25;
+	String? vehicle;
+	String? certificate;
+	@JSONField(name: "created_by")
+	String? createdBy;
+	@JSONField(name: "created_at")
+	String? createdAt;
+
+	UkTemplateTableRows();
+
+	factory UkTemplateTableRows.fromJson(Map<String, dynamic> json) => $UkTemplateTableRowsFromJson(json);
+
+	Map<String, dynamic> toJson() => $UkTemplateTableRowsToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}

packages/cs_domain/lib/generated/json/base/json_convert_content.dart

@@ -105,7 +105,6 @@ import 'package:domain/entity/response/u_k_report_labour_entity.dart';
 import 'package:domain/entity/response/u_k_report_working_hours_entity.dart';
 import 'package:domain/entity/response/u_k_security_attendance_entity.dart';
 import 'package:domain/entity/response/u_k_security_attendance_option_entity.dart';
-import 'package:domain/entity/response/u_k_template_entity.dart';
 import 'package:domain/entity/response/uk_attendance_review_entity.dart';
 import 'package:domain/entity/response/uk_attendance_review_remark_entity.dart';
 import 'package:domain/entity/response/uk_job_applied_revise_add_detail_entity.dart';
@@ -117,7 +116,7 @@ import 'package:domain/entity/response/uk_job_list_applied_staff_search_entity.d
 import 'package:domain/entity/response/uk_job_template_detail_by_select_title_entity.dart';
 import 'package:domain/entity/response/uk_lab_req_show_template_entity.dart';
 import 'package:domain/entity/response/uk_labour_request_detail_entity.dart';
-import 'package:domain/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
+import 'package:domain/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
 import 'package:domain/entity/response/uk_labour_request_preselected_list_entity.dart';
 import 'package:domain/entity/response/uk_labour_request_review_detail_entity.dart';
 import 'package:domain/entity/response/uk_labour_request_review_list_entity.dart';
@@ -130,6 +129,7 @@ import 'package:domain/entity/response/uk_staff_detail_entity.dart';
 import 'package:domain/entity/response/uk_staff_labour_history_entity.dart';
 import 'package:domain/entity/response/uk_template_detail_entity.dart';
 import 'package:domain/entity/response/uk_template_detail_index_entity.dart';
+import 'package:domain/entity/response/uk_template_table_entity.dart';
 import 'package:domain/entity/response/uk_template_title_option_entity.dart';
 import 'package:domain/entity/server_time.dart';
 
@@ -897,12 +897,6 @@ class JsonConvert {
     if (<UKSecurityAttendanceOptionFilter>[] is M) {
       return data.map<UKSecurityAttendanceOptionFilter>((Map<String, dynamic> e) => UKSecurityAttendanceOptionFilter.fromJson(e)).toList() as M;
     }
-    if (<UKTemplateEntity>[] is M) {
-      return data.map<UKTemplateEntity>((Map<String, dynamic> e) => UKTemplateEntity.fromJson(e)).toList() as M;
-    }
-    if (<UKTemplateRows>[] is M) {
-      return data.map<UKTemplateRows>((Map<String, dynamic> e) => UKTemplateRows.fromJson(e)).toList() as M;
-    }
     if (<UkAttendanceReviewEntity>[] is M) {
       return data.map<UkAttendanceReviewEntity>((Map<String, dynamic> e) => UkAttendanceReviewEntity.fromJson(e)).toList() as M;
     }
@@ -1015,12 +1009,141 @@ class JsonConvert {
     if (<UkLabourRequestDetailEmploymentList>[] is M) {
       return data.map<UkLabourRequestDetailEmploymentList>((Map<String, dynamic> e) => UkLabourRequestDetailEmploymentList.fromJson(e)).toList() as M;
     }
-    if (<UkLabourRequestPreselectAddstatffListEntity>[] is M) {
-      return data.map<UkLabourRequestPreselectAddstatffListEntity>((Map<String, dynamic> e) => UkLabourRequestPreselectAddstatffListEntity.fromJson(e))
-          .toList() as M;
+    if (<UkLabourRequestPreselectAddstaffListEntity>[] is M) {
+      return data.map<UkLabourRequestPreselectAddstaffListEntity>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestPreselectAddstaffListEntity.fromJson(e)).toList() as M;
     }
-    if (<UkLabourRequestPreselectAddstatffListRows>[] is M) {
-      return data.map<UkLabourRequestPreselectAddstatffListRows>((Map<String, dynamic> e) => UkLabourRequestPreselectAddstatffListRows.fromJson(e))
+    if (<UkLabourRequestPreselectAddstaffListRows>[] is M) {
+      return data.map<UkLabourRequestPreselectAddstaffListRows>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestPreselectAddstaffListRows.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestPreselectedListEntity>[] is M) {
+      return data.map<UkLabourRequestPreselectedListEntity>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestPreselectedListEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestPreselectedListRows>[] is M) {
+      return data.map<UkLabourRequestPreselectedListRows>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestPreselectedListRows.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewDetailEntity>[] is M) {
+      return data.map<UkLabourRequestReviewDetailEntity>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewDetailOrder>[] is M) {
+      return data.map<UkLabourRequestReviewDetailOrder>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewDetailOrder.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewDetailOrderRequest>[] is M) {
+      return data.map<UkLabourRequestReviewDetailOrderRequest>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewDetailOrderRequest.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewDetailOrderRecords>[] is M) {
+      return data.map<UkLabourRequestReviewDetailOrderRecords>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewDetailOrderRecords.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewDetailRecords>[] is M) {
+      return data.map<UkLabourRequestReviewDetailRecords>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewDetailRecords.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewListEntity>[] is M) {
+      return data.map<UkLabourRequestReviewListEntity>((
+          Map<String, dynamic> e) =>
+          UkLabourRequestReviewListEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestReviewListRows>[] is M) {
+      return data.map<UkLabourRequestReviewListRows>((Map<String, dynamic> e) =>
+          UkLabourRequestReviewListRows.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestTableEntity>[] is M) {
+      return data.map<UkLabourRequestTableEntity>((Map<String, dynamic> e) =>
+          UkLabourRequestTableEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourRequestTableRows>[] is M) {
+      return data.map<UkLabourRequestTableRows>((Map<String, dynamic> e) =>
+          UkLabourRequestTableRows.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourReviewStatusEntity>[] is M) {
+      return data.map<UkLabourReviewStatusEntity>((Map<String, dynamic> e) =>
+          UkLabourReviewStatusEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourReviewStatusRow>[] is M) {
+      return data.map<UkLabourReviewStatusRow>((Map<String, dynamic> e) =>
+          UkLabourReviewStatusRow.fromJson(e)).toList() as M;
+    }
+    if (<UkLabourReviewStatusRecords>[] is M) {
+      return data.map<UkLabourReviewStatusRecords>((Map<String, dynamic> e) =>
+          UkLabourReviewStatusRecords.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualEntity>[] is M) {
+      return data.map<UkReportCasualEntity>((Map<String, dynamic> e) =>
+          UkReportCasualEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualRows>[] is M) {
+      return data.map<UkReportCasualRows>((Map<String, dynamic> e) =>
+          UkReportCasualRows.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualTotal>[] is M) {
+      return data.map<UkReportCasualTotal>((Map<String, dynamic> e) =>
+          UkReportCasualTotal.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualPayEntity>[] is M) {
+      return data.map<UkReportCasualPayEntity>((Map<String, dynamic> e) =>
+          UkReportCasualPayEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualPayRows>[] is M) {
+      return data.map<UkReportCasualPayRows>((Map<String, dynamic> e) =>
+          UkReportCasualPayRows.fromJson(e)).toList() as M;
+    }
+    if (<UkReportCasualPayTotal>[] is M) {
+      return data.map<UkReportCasualPayTotal>((Map<String, dynamic> e) =>
+          UkReportCasualPayTotal.fromJson(e)).toList() as M;
+    }
+    if (<UkReportOutletEntity>[] is M) {
+      return data.map<UkReportOutletEntity>((Map<String, dynamic> e) =>
+          UkReportOutletEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkReportOutletRequestList>[] is M) {
+      return data.map<UkReportOutletRequestList>((Map<String, dynamic> e) =>
+          UkReportOutletRequestList.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffDetailEntity>[] is M) {
+      return data.map<UkStaffDetailEntity>((Map<String, dynamic> e) =>
+          UkStaffDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffDetailCertificates>[] is M) {
+      return data.map<UkStaffDetailCertificates>((Map<String, dynamic> e) =>
+          UkStaffDetailCertificates.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffLabourHistoryEntity>[] is M) {
+      return data.map<UkStaffLabourHistoryEntity>((Map<String, dynamic> e) =>
+          UkStaffLabourHistoryEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffLabourHistoryRows>[] is M) {
+      return data.map<UkStaffLabourHistoryRows>((Map<String, dynamic> e) =>
+          UkStaffLabourHistoryRows.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffLabourHistoryRowsSecurityIn>[] is M) {
+      return data.map<UkStaffLabourHistoryRowsSecurityIn>((
+          Map<String, dynamic> e) =>
+          UkStaffLabourHistoryRowsSecurityIn.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffLabourHistoryRowsSecurityOut>[] is M) {
+      return data.map<UkStaffLabourHistoryRowsSecurityOut>((
+          Map<String, dynamic> e) =>
+          UkStaffLabourHistoryRowsSecurityOut.fromJson(e)).toList() as M;
+    }
+    if (<UkStaffLabourHistoryRowsWorkIn>[] is M) {
+      return data.map<UkStaffLabourHistoryRowsWorkIn>((
+          Map<String, dynamic> e) => UkStaffLabourHistoryRowsWorkIn.fromJson(e))
           .toList() as M;
     }
     if (<UkLabourRequestPreselectedListEntity>[] is M) {
@@ -1128,6 +1251,11 @@ class JsonConvert {
     if (<UkTemplateDetailVehicleList>[] is M) {
       return data.map<UkTemplateDetailVehicleList>((Map<String, dynamic> e) => UkTemplateDetailVehicleList.fromJson(e)).toList() as M;
     }
+    if (<UkTemplateDetailChallenge25List>[] is M) {
+      return data.map<UkTemplateDetailChallenge25List>((
+          Map<String, dynamic> e) =>
+          UkTemplateDetailChallenge25List.fromJson(e)).toList() as M;
+    }
     if (<UkTemplateDetailIndexEntity>[] is M) {
       return data.map<UkTemplateDetailIndexEntity>((Map<String, dynamic> e) => UkTemplateDetailIndexEntity.fromJson(e)).toList() as M;
     }
@@ -1137,6 +1265,19 @@ class JsonConvert {
     if (<UkTemplateDetailIndexVehicleList>[] is M) {
       return data.map<UkTemplateDetailIndexVehicleList>((Map<String, dynamic> e) => UkTemplateDetailIndexVehicleList.fromJson(e)).toList() as M;
     }
+    if (<UkTemplateDetailIndexChallenge25List>[] is M) {
+      return data.map<UkTemplateDetailIndexChallenge25List>((
+          Map<String, dynamic> e) =>
+          UkTemplateDetailIndexChallenge25List.fromJson(e)).toList() as M;
+    }
+    if (<UkTemplateTableEntity>[] is M) {
+      return data.map<UkTemplateTableEntity>((Map<String, dynamic> e) =>
+          UkTemplateTableEntity.fromJson(e)).toList() as M;
+    }
+    if (<UkTemplateTableRows>[] is M) {
+      return data.map<UkTemplateTableRows>((Map<String, dynamic> e) =>
+          UkTemplateTableRows.fromJson(e)).toList() as M;
+    }
     if (<UkTemplateTitleOptionEntity>[] is M) {
       return data.map<UkTemplateTitleOptionEntity>((Map<String, dynamic> e) => UkTemplateTitleOptionEntity.fromJson(e)).toList() as M;
     }
@@ -1372,10 +1513,10 @@ class JsonConvertClassCollection {
     (UKSecurityAttendanceEntity).toString(): UKSecurityAttendanceEntity.fromJson,
     (UKSecurityAttendanceRows).toString(): UKSecurityAttendanceRows.fromJson,
     (UKSecurityInOut).toString(): UKSecurityInOut.fromJson,
-    (UKSecurityAttendanceOptionEntity).toString(): UKSecurityAttendanceOptionEntity.fromJson,
-    (UKSecurityAttendanceOptionFilter).toString(): UKSecurityAttendanceOptionFilter.fromJson,
-    (UKTemplateEntity).toString(): UKTemplateEntity.fromJson,
-    (UKTemplateRows).toString(): UKTemplateRows.fromJson,
+    (UKSecurityAttendanceOptionEntity)
+        .toString(): UKSecurityAttendanceOptionEntity.fromJson,
+    (UKSecurityAttendanceOptionFilter)
+        .toString(): UKSecurityAttendanceOptionFilter.fromJson,
     (UkAttendanceReviewEntity).toString(): UkAttendanceReviewEntity.fromJson,
     (UkAttendanceReviewRows).toString(): UkAttendanceReviewRows.fromJson,
     (UkAttendanceReviewRemarkEntity).toString(): UkAttendanceReviewRemarkEntity.fromJson,
@@ -1395,35 +1536,64 @@ class JsonConvertClassCollection {
     (UkJobAppliedReviseLogRecordsContentReason).toString(): UkJobAppliedReviseLogRecordsContentReason.fromJson,
     (UkJobAppliedStaffListEntity).toString(): UkJobAppliedStaffListEntity.fromJson,
     (UkJobAppliedStaffListRows).toString(): UkJobAppliedStaffListRows.fromJson,
-    (UkJobAppliedStaffListRowsSecurityIn).toString(): UkJobAppliedStaffListRowsSecurityIn.fromJson,
-    (UkJobAppliedStaffListRowsSecurityOut).toString(): UkJobAppliedStaffListRowsSecurityOut.fromJson,
-    (UkJobAppliedStaffListRowsWorkIn).toString(): UkJobAppliedStaffListRowsWorkIn.fromJson,
-    (UkJobAppliedStaffListRowsWorkOut).toString(): UkJobAppliedStaffListRowsWorkOut.fromJson,
-    (UkJobListAppliedStaffSearchEntity).toString(): UkJobListAppliedStaffSearchEntity.fromJson,
-    (UkJobListAppliedStaffSearchRows).toString(): UkJobListAppliedStaffSearchRows.fromJson,
-    (UkJobTemplateDetailBySelectTitleEntity).toString(): UkJobTemplateDetailBySelectTitleEntity.fromJson,
-    (UkLabReqShowTemplateEntity).toString(): UkLabReqShowTemplateEntity.fromJson,
-    (UkLabourRequestDetailEntity).toString(): UkLabourRequestDetailEntity.fromJson,
-    (UkLabourRequestDetailCertificateList).toString(): UkLabourRequestDetailCertificateList.fromJson,
-    (UkLabourRequestDetailVehicleList).toString(): UkLabourRequestDetailVehicleList.fromJson,
-    (UkLabourRequestDetailChallenge25List).toString(): UkLabourRequestDetailChallenge25List.fromJson,
-    (UkLabourRequestDetailLocationList).toString(): UkLabourRequestDetailLocationList.fromJson,
-    (UkLabourRequestDetailTemplateList).toString(): UkLabourRequestDetailTemplateList.fromJson,
-    (UkLabourRequestDetailDepartmentList).toString(): UkLabourRequestDetailDepartmentList.fromJson,
-    (UkLabourRequestDetailChargeList).toString(): UkLabourRequestDetailChargeList.fromJson,
-    (UkLabourRequestDetailEmploymentList).toString(): UkLabourRequestDetailEmploymentList.fromJson,
-    (UkLabourRequestPreselectAddstatffListEntity).toString(): UkLabourRequestPreselectAddstatffListEntity.fromJson,
-    (UkLabourRequestPreselectAddstatffListRows).toString(): UkLabourRequestPreselectAddstatffListRows.fromJson,
-    (UkLabourRequestPreselectedListEntity).toString(): UkLabourRequestPreselectedListEntity.fromJson,
-    (UkLabourRequestPreselectedListRows).toString(): UkLabourRequestPreselectedListRows.fromJson,
-    (UkLabourRequestReviewDetailEntity).toString(): UkLabourRequestReviewDetailEntity.fromJson,
-    (UkLabourRequestReviewDetailOrder).toString(): UkLabourRequestReviewDetailOrder.fromJson,
-    (UkLabourRequestReviewDetailOrderRequest).toString(): UkLabourRequestReviewDetailOrderRequest.fromJson,
-    (UkLabourRequestReviewDetailOrderRecords).toString(): UkLabourRequestReviewDetailOrderRecords.fromJson,
-    (UkLabourRequestReviewDetailRecords).toString(): UkLabourRequestReviewDetailRecords.fromJson,
-    (UkLabourRequestReviewListEntity).toString(): UkLabourRequestReviewListEntity.fromJson,
-    (UkLabourRequestReviewListRows).toString(): UkLabourRequestReviewListRows.fromJson,
-    (UkLabourRequestTableEntity).toString(): UkLabourRequestTableEntity.fromJson,
+    (UkJobAppliedStaffListRowsSecurityIn)
+        .toString(): UkJobAppliedStaffListRowsSecurityIn.fromJson,
+    (UkJobAppliedStaffListRowsSecurityOut)
+        .toString(): UkJobAppliedStaffListRowsSecurityOut.fromJson,
+    (UkJobAppliedStaffListRowsWorkIn)
+        .toString(): UkJobAppliedStaffListRowsWorkIn.fromJson,
+    (UkJobAppliedStaffListRowsWorkOut)
+        .toString(): UkJobAppliedStaffListRowsWorkOut.fromJson,
+    (UkJobListAppliedStaffSearchEntity)
+        .toString(): UkJobListAppliedStaffSearchEntity.fromJson,
+    (UkJobListAppliedStaffSearchRows)
+        .toString(): UkJobListAppliedStaffSearchRows.fromJson,
+    (UkJobTemplateDetailBySelectTitleEntity)
+        .toString(): UkJobTemplateDetailBySelectTitleEntity.fromJson,
+    (UkLabReqShowTemplateEntity).toString(): UkLabReqShowTemplateEntity
+        .fromJson,
+    (UkLabourRequestDetailEntity).toString(): UkLabourRequestDetailEntity
+        .fromJson,
+    (UkLabourRequestDetailCertificateList)
+        .toString(): UkLabourRequestDetailCertificateList.fromJson,
+    (UkLabourRequestDetailVehicleList)
+        .toString(): UkLabourRequestDetailVehicleList.fromJson,
+    (UkLabourRequestDetailChallenge25List)
+        .toString(): UkLabourRequestDetailChallenge25List.fromJson,
+    (UkLabourRequestDetailLocationList)
+        .toString(): UkLabourRequestDetailLocationList.fromJson,
+    (UkLabourRequestDetailTemplateList)
+        .toString(): UkLabourRequestDetailTemplateList.fromJson,
+    (UkLabourRequestDetailDepartmentList)
+        .toString(): UkLabourRequestDetailDepartmentList.fromJson,
+    (UkLabourRequestDetailChargeList)
+        .toString(): UkLabourRequestDetailChargeList.fromJson,
+    (UkLabourRequestDetailEmploymentList)
+        .toString(): UkLabourRequestDetailEmploymentList.fromJson,
+    (UkLabourRequestPreselectAddstaffListEntity)
+        .toString(): UkLabourRequestPreselectAddstaffListEntity.fromJson,
+    (UkLabourRequestPreselectAddstaffListRows)
+        .toString(): UkLabourRequestPreselectAddstaffListRows.fromJson,
+    (UkLabourRequestPreselectedListEntity)
+        .toString(): UkLabourRequestPreselectedListEntity.fromJson,
+    (UkLabourRequestPreselectedListRows)
+        .toString(): UkLabourRequestPreselectedListRows.fromJson,
+    (UkLabourRequestReviewDetailEntity)
+        .toString(): UkLabourRequestReviewDetailEntity.fromJson,
+    (UkLabourRequestReviewDetailOrder)
+        .toString(): UkLabourRequestReviewDetailOrder.fromJson,
+    (UkLabourRequestReviewDetailOrderRequest)
+        .toString(): UkLabourRequestReviewDetailOrderRequest.fromJson,
+    (UkLabourRequestReviewDetailOrderRecords)
+        .toString(): UkLabourRequestReviewDetailOrderRecords.fromJson,
+    (UkLabourRequestReviewDetailRecords)
+        .toString(): UkLabourRequestReviewDetailRecords.fromJson,
+    (UkLabourRequestReviewListEntity)
+        .toString(): UkLabourRequestReviewListEntity.fromJson,
+    (UkLabourRequestReviewListRows).toString(): UkLabourRequestReviewListRows
+        .fromJson,
+    (UkLabourRequestTableEntity).toString(): UkLabourRequestTableEntity
+        .fromJson,
     (UkLabourRequestTableRows).toString(): UkLabourRequestTableRows.fromJson,
     (UkLabourReviewStatusEntity).toString(): UkLabourReviewStatusEntity.fromJson,
     (UkLabourReviewStatusRow).toString(): UkLabourReviewStatusRow.fromJson,
@@ -1447,12 +1617,24 @@ class JsonConvertClassCollection {
     (UkTemplateDetailEntity).toString(): UkTemplateDetailEntity.fromJson,
     (UkTemplateDetailRow).toString(): UkTemplateDetailRow.fromJson,
     (UkTemplateDetailTitleList).toString(): UkTemplateDetailTitleList.fromJson,
-    (UkTemplateDetailCertificateList).toString(): UkTemplateDetailCertificateList.fromJson,
-    (UkTemplateDetailVehicleList).toString(): UkTemplateDetailVehicleList.fromJson,
-    (UkTemplateDetailIndexEntity).toString(): UkTemplateDetailIndexEntity.fromJson,
-    (UkTemplateDetailIndexCertificateList).toString(): UkTemplateDetailIndexCertificateList.fromJson,
-    (UkTemplateDetailIndexVehicleList).toString(): UkTemplateDetailIndexVehicleList.fromJson,
-    (UkTemplateTitleOptionEntity).toString(): UkTemplateTitleOptionEntity.fromJson,
+    (UkTemplateDetailCertificateList)
+        .toString(): UkTemplateDetailCertificateList.fromJson,
+    (UkTemplateDetailVehicleList).toString(): UkTemplateDetailVehicleList
+        .fromJson,
+    (UkTemplateDetailChallenge25List)
+        .toString(): UkTemplateDetailChallenge25List.fromJson,
+    (UkTemplateDetailIndexEntity).toString(): UkTemplateDetailIndexEntity
+        .fromJson,
+    (UkTemplateDetailIndexCertificateList)
+        .toString(): UkTemplateDetailIndexCertificateList.fromJson,
+    (UkTemplateDetailIndexVehicleList)
+        .toString(): UkTemplateDetailIndexVehicleList.fromJson,
+    (UkTemplateDetailIndexChallenge25List)
+        .toString(): UkTemplateDetailIndexChallenge25List.fromJson,
+    (UkTemplateTableEntity).toString(): UkTemplateTableEntity.fromJson,
+    (UkTemplateTableRows).toString(): UkTemplateTableRows.fromJson,
+    (UkTemplateTitleOptionEntity).toString(): UkTemplateTitleOptionEntity
+        .fromJson,
     (ServerTime).toString(): ServerTime.fromJson,
   };
 

packages/cs_domain/lib/generated/json/u_k_template_entity.g.dart

@@ -1,107 +0,0 @@
-import 'package:domain/generated/json/base/json_convert_content.dart';
-import 'package:domain/entity/response/u_k_template_entity.dart';
-
-UKTemplateEntity $UKTemplateEntityFromJson(Map<String, dynamic> json) {
-  final UKTemplateEntity uKTemplateEntity = UKTemplateEntity();
-  final int? total = jsonConvert.convert<int>(json['total']);
-  if (total != null) {
-    uKTemplateEntity.total = total;
-  }
-  final List<UKTemplateRows>? rows = (json['rows'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UKTemplateRows>(e) as UKTemplateRows).toList();
-  if (rows != null) {
-    uKTemplateEntity.rows = rows;
-  }
-  return uKTemplateEntity;
-}
-
-Map<String, dynamic> $UKTemplateEntityToJson(UKTemplateEntity entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['total'] = entity.total;
-  data['rows'] = entity.rows.map((v) => v.toJson()).toList();
-  return data;
-}
-
-extension UKTemplateEntityExtension on UKTemplateEntity {
-  UKTemplateEntity copyWith({
-    int? total,
-    List<UKTemplateRows>? rows,
-  }) {
-    return UKTemplateEntity()
-      ..total = total ?? this.total
-      ..rows = rows ?? this.rows;
-  }
-}
-
-UKTemplateRows $UKTemplateRowsFromJson(Map<String, dynamic> json) {
-  final UKTemplateRows uKTemplateRows = UKTemplateRows();
-  final String? id = jsonConvert.convert<String>(json['id']);
-  if (id != null) {
-    uKTemplateRows.id = id;
-  }
-  final String? jobTitle = jsonConvert.convert<String>(json['job_title']);
-  if (jobTitle != null) {
-    uKTemplateRows.jobTitle = jobTitle;
-  }
-  final String? vehicle = jsonConvert.convert<String>(json['vehicle']);
-  if (vehicle != null) {
-    uKTemplateRows.vehicle = vehicle;
-  }
-  final String? certificate = jsonConvert.convert<String>(json['certificate']);
-  if (certificate != null) {
-    uKTemplateRows.certificate = certificate;
-  }
-  final String? contactName = jsonConvert.convert<String>(json['contact_name']);
-  if (contactName != null) {
-    uKTemplateRows.contactName = contactName;
-  }
-  final String? contactNo = jsonConvert.convert<String>(json['contact_no']);
-  if (contactNo != null) {
-    uKTemplateRows.contactNo = contactNo;
-  }
-  final String? createdBy = jsonConvert.convert<String>(json['created_by']);
-  if (createdBy != null) {
-    uKTemplateRows.createdBy = createdBy;
-  }
-  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
-  if (createdAt != null) {
-    uKTemplateRows.createdAt = createdAt;
-  }
-  return uKTemplateRows;
-}
-
-Map<String, dynamic> $UKTemplateRowsToJson(UKTemplateRows entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['id'] = entity.id;
-  data['job_title'] = entity.jobTitle;
-  data['vehicle'] = entity.vehicle;
-  data['certificate'] = entity.certificate;
-  data['contact_name'] = entity.contactName;
-  data['contact_no'] = entity.contactNo;
-  data['created_by'] = entity.createdBy;
-  data['created_at'] = entity.createdAt;
-  return data;
-}
-
-extension UKTemplateRowsExtension on UKTemplateRows {
-  UKTemplateRows copyWith({
-    String? id,
-    String? jobTitle,
-    String? vehicle,
-    String? certificate,
-    String? contactName,
-    String? contactNo,
-    String? createdBy,
-    String? createdAt,
-  }) {
-    return UKTemplateRows()
-      ..id = id ?? this.id
-      ..jobTitle = jobTitle ?? this.jobTitle
-      ..vehicle = vehicle ?? this.vehicle
-      ..certificate = certificate ?? this.certificate
-      ..contactName = contactName ?? this.contactName
-      ..contactNo = contactNo ?? this.contactNo
-      ..createdBy = createdBy ?? this.createdBy
-      ..createdAt = createdAt ?? this.createdAt;
-  }
-}

packages/cs_domain/lib/generated/json/uk_job_template_detail_by_select_title_entity.g.dart

@@ -19,6 +19,10 @@ UkJobTemplateDetailBySelectTitleEntity $UkJobTemplateDetailBySelectTitleEntityFr
   if (contact != null) {
     ukJobTemplateDetailBySelectTitleEntity.contact = contact;
   }
+  final String? client = jsonConvert.convert<String>(json['client']);
+  if (client != null) {
+    ukJobTemplateDetailBySelectTitleEntity.client = client;
+  }
   final String? contactNo = jsonConvert.convert<String>(json['contact_no']);
   if (contactNo != null) {
     ukJobTemplateDetailBySelectTitleEntity.contactNo = contactNo;
@@ -72,6 +76,7 @@ Map<String, dynamic> $UkJobTemplateDetailBySelectTitleEntityToJson(UkJobTemplate
   data['title_id'] = entity.titleId;
   data['title'] = entity.title;
   data['contact'] = entity.contact;
+  data['client'] = entity.client;
   data['contact_no'] = entity.contactNo;
   data['requirements'] = entity.requirements;
   data['note'] = entity.note;
@@ -92,6 +97,7 @@ extension UkJobTemplateDetailBySelectTitleEntityExtension on UkJobTemplateDetail
     int? titleId,
     String? title,
     String? contact,
+    String? client,
     String? contactNo,
     String? requirements,
     String? note,
@@ -109,6 +115,7 @@ extension UkJobTemplateDetailBySelectTitleEntityExtension on UkJobTemplateDetail
       ..titleId = titleId ?? this.titleId
       ..title = title ?? this.title
       ..contact = contact ?? this.contact
+      ..client = client ?? this.client
       ..contactNo = contactNo ?? this.contactNo
       ..requirements = requirements ?? this.requirements
       ..note = note ?? this.note

packages/cs_domain/lib/generated/json/uk_lab_req_show_template_entity.g.dart

@@ -75,6 +75,14 @@ UkLabReqShowTemplateEntity $UkLabReqShowTemplateEntityFromJson(Map<String, dynam
   if (jobTitleId != null) {
     ukLabReqShowTemplateEntity.jobTitleId = jobTitleId;
   }
+  final String? clientName = jsonConvert.convert<String>(json['client_name']);
+  if (clientName != null) {
+    ukLabReqShowTemplateEntity.clientName = clientName;
+  }
+  final int? challenge25 = jsonConvert.convert<int>(json['challenge_25']);
+  if (challenge25 != null) {
+    ukLabReqShowTemplateEntity.challenge25 = challenge25;
+  }
   return ukLabReqShowTemplateEntity;
 }
 
@@ -98,6 +106,8 @@ Map<String, dynamic> $UkLabReqShowTemplateEntityToJson(UkLabReqShowTemplateEntit
   data['deleted_at'] = entity.deletedAt;
   data['template_id'] = entity.templateId;
   data['job_title_id'] = entity.jobTitleId;
+  data['client_name'] = entity.clientName;
+  data['challenge_25'] = entity.challenge25;
   return data;
 }
 
@@ -121,6 +131,8 @@ extension UkLabReqShowTemplateEntityExtension on UkLabReqShowTemplateEntity {
     dynamic deletedAt,
     int? templateId,
     int? jobTitleId,
+    String? clientName,
+    int? challenge25,
   }) {
     return UkLabReqShowTemplateEntity()
       ..id = id ?? this.id
@@ -140,6 +152,8 @@ extension UkLabReqShowTemplateEntityExtension on UkLabReqShowTemplateEntity {
       ..updatedAt = updatedAt ?? this.updatedAt
       ..deletedAt = deletedAt ?? this.deletedAt
       ..templateId = templateId ?? this.templateId
-      ..jobTitleId = jobTitleId ?? this.jobTitleId;
+      ..jobTitleId = jobTitleId ?? this.jobTitleId
+      ..clientName = clientName ?? this.clientName
+      ..challenge25 = challenge25 ?? this.challenge25;
   }
 }

packages/cs_domain/lib/generated/json/uk_labour_request_detail_entity.g.dart

@@ -55,11 +55,11 @@ UkLabourRequestDetailEntity $UkLabourRequestDetailEntityFromJson(Map<String, dyn
   if (employmentType != null) {
     ukLabourRequestDetailEntity.employmentType = employmentType;
   }
-  final dynamic eventName = json['event_name'];
+  final String? eventName = jsonConvert.convert<String>(json['event_name']);
   if (eventName != null) {
     ukLabourRequestDetailEntity.eventName = eventName;
   }
-  final dynamic eventType = json['event_type'];
+  final String? eventType = jsonConvert.convert<String>(json['event_type']);
   if (eventType != null) {
     ukLabourRequestDetailEntity.eventType = eventType;
   }
@@ -75,11 +75,11 @@ UkLabourRequestDetailEntity $UkLabourRequestDetailEntityFromJson(Map<String, dyn
   if (position != null) {
     ukLabourRequestDetailEntity.position = position;
   }
-  final dynamic description = json['description'];
+  final String? description = jsonConvert.convert<String>(json['description']);
   if (description != null) {
     ukLabourRequestDetailEntity.description = description;
   }
-  final dynamic attUrl = json['att_url'];
+  final String? attUrl = jsonConvert.convert<String>(json['att_url']);
   if (attUrl != null) {
     ukLabourRequestDetailEntity.attUrl = attUrl;
   }
@@ -91,8 +91,33 @@ UkLabourRequestDetailEntity $UkLabourRequestDetailEntityFromJson(Map<String, dyn
   if (estRatio != null) {
     ukLabourRequestDetailEntity.estRatio = estRatio;
   }
-  final List<UkLabourRequestDetailCertificateList>? certificateList = (json['certificate_list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UkLabourRequestDetailCertificateList>(e) as UkLabourRequestDetailCertificateList).toList();
+  final String? videoText = jsonConvert.convert<String>(json['video_text']);
+  if (videoText != null) {
+    ukLabourRequestDetailEntity.videoText = videoText;
+  }
+  final String? videoCover = jsonConvert.convert<String>(json['video_cover']);
+  if (videoCover != null) {
+    ukLabourRequestDetailEntity.videoCover = videoCover;
+  }
+  final String? video = jsonConvert.convert<String>(json['video']);
+  if (video != null) {
+    ukLabourRequestDetailEntity.video = video;
+  }
+  final String? otherImage = jsonConvert.convert<String>(json['other_image']);
+  if (otherImage != null) {
+    ukLabourRequestDetailEntity.otherImage = otherImage;
+  }
+  final String? otherDocument = jsonConvert.convert<String>(
+      json['other_document']);
+  if (otherDocument != null) {
+    ukLabourRequestDetailEntity.otherDocument = otherDocument;
+  }
+  final List<
+      UkLabourRequestDetailCertificateList>? certificateList = (json['certificate_list'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<UkLabourRequestDetailCertificateList>(
+          e) as UkLabourRequestDetailCertificateList).toList();
   if (certificateList != null) {
     ukLabourRequestDetailEntity.certificateList = certificateList;
   }
@@ -158,7 +183,13 @@ Map<String, dynamic> $UkLabourRequestDetailEntityToJson(UkLabourRequestDetailEnt
   data['att_url'] = entity.attUrl;
   data['est_cost'] = entity.estCost;
   data['est_ratio'] = entity.estRatio;
-  data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
+  data['video_text'] = entity.videoText;
+  data['video_cover'] = entity.videoCover;
+  data['video'] = entity.video;
+  data['other_image'] = entity.otherImage;
+  data['other_document'] = entity.otherDocument;
+  data['certificate_list'] =
+      entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
   data['challenge_25_list'] = entity.challenge25List?.map((v) => v.toJson()).toList();
   data['location_list'] = entity.locationList?.map((v) => v.toJson()).toList();
@@ -184,15 +215,20 @@ extension UkLabourRequestDetailEntityExtension on UkLabourRequestDetailEntity {
     String? salaryBy,
     int? amount,
     int? employmentType,
-    dynamic eventName,
-    dynamic eventType,
+    String? eventName,
+    String? eventType,
     int? passengers,
     dynamic estRevenue,
     String? position,
-    dynamic description,
-    dynamic attUrl,
+    String? description,
+    String? attUrl,
     String? estCost,
     String? estRatio,
+    String? videoText,
+    String? videoCover,
+    String? video,
+    String? otherImage,
+    String? otherDocument,
     List<UkLabourRequestDetailCertificateList>? certificateList,
     List<UkLabourRequestDetailVehicleList>? vehicleList,
     List<UkLabourRequestDetailChallenge25List>? challenge25List,
@@ -225,6 +261,11 @@ extension UkLabourRequestDetailEntityExtension on UkLabourRequestDetailEntity {
       ..attUrl = attUrl ?? this.attUrl
       ..estCost = estCost ?? this.estCost
       ..estRatio = estRatio ?? this.estRatio
+      ..videoText = videoText ?? this.videoText
+      ..videoCover = videoCover ?? this.videoCover
+      ..video = video ?? this.video
+      ..otherImage = otherImage ?? this.otherImage
+      ..otherDocument = otherDocument ?? this.otherDocument
       ..certificateList = certificateList ?? this.certificateList
       ..vehicleList = vehicleList ?? this.vehicleList
       ..challenge25List = challenge25List ?? this.challenge25List

packages/cs_domain/lib/generated/json/uk_labour_request_preselect_addstaff_list_entity.g.dart

@@ -0,0 +1,123 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
+
+UkLabourRequestPreselectAddstaffListEntity $UkLabourRequestPreselectAddstaffListEntityFromJson(
+    Map<String, dynamic> json) {
+  final UkLabourRequestPreselectAddstaffListEntity ukLabourRequestPreselectAddstaffListEntity = UkLabourRequestPreselectAddstaffListEntity();
+  final int? total = jsonConvert.convert<int>(json['total']);
+  if (total != null) {
+    ukLabourRequestPreselectAddstaffListEntity.total = total;
+  }
+  final List<
+      UkLabourRequestPreselectAddstaffListRows>? rows = (json['rows'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<UkLabourRequestPreselectAddstaffListRows>(
+          e) as UkLabourRequestPreselectAddstaffListRows).toList();
+  if (rows != null) {
+    ukLabourRequestPreselectAddstaffListEntity.rows = rows;
+  }
+  return ukLabourRequestPreselectAddstaffListEntity;
+}
+
+Map<String, dynamic> $UkLabourRequestPreselectAddstaffListEntityToJson(
+    UkLabourRequestPreselectAddstaffListEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['total'] = entity.total;
+  data['rows'] = entity.rows?.map((v) => v.toJson()).toList();
+  return data;
+}
+
+extension UkLabourRequestPreselectAddstaffListEntityExtension on UkLabourRequestPreselectAddstaffListEntity {
+  UkLabourRequestPreselectAddstaffListEntity copyWith({
+    int? total,
+    List<UkLabourRequestPreselectAddstaffListRows>? rows,
+  }) {
+    return UkLabourRequestPreselectAddstaffListEntity()
+      ..total = total ?? this.total
+      ..rows = rows ?? this.rows;
+  }
+}
+
+UkLabourRequestPreselectAddstaffListRows $UkLabourRequestPreselectAddstaffListRowsFromJson(
+    Map<String, dynamic> json) {
+  final UkLabourRequestPreselectAddstaffListRows ukLabourRequestPreselectAddstaffListRows = UkLabourRequestPreselectAddstaffListRows();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    ukLabourRequestPreselectAddstaffListRows.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    ukLabourRequestPreselectAddstaffListRows.name = name;
+  }
+  final int? isFavourite = jsonConvert.convert<int>(json['is_favourite']);
+  if (isFavourite != null) {
+    ukLabourRequestPreselectAddstaffListRows.isFavourite = isFavourite;
+  }
+  final String? gender = jsonConvert.convert<String>(json['gender']);
+  if (gender != null) {
+    ukLabourRequestPreselectAddstaffListRows.gender = gender;
+  }
+  final String? nric = jsonConvert.convert<String>(json['nric']);
+  if (nric != null) {
+    ukLabourRequestPreselectAddstaffListRows.nric = nric;
+  }
+  final String? profilePicture = jsonConvert.convert<String>(
+      json['profile_picture']);
+  if (profilePicture != null) {
+    ukLabourRequestPreselectAddstaffListRows.profilePicture = profilePicture;
+  }
+  final int? status = jsonConvert.convert<int>(json['status']);
+  if (status != null) {
+    ukLabourRequestPreselectAddstaffListRows.status = status;
+  }
+  final int? applyState = jsonConvert.convert<int>(json['apply_state']);
+  if (applyState != null) {
+    ukLabourRequestPreselectAddstaffListRows.applyState = applyState;
+  }
+  final bool? isSelected = jsonConvert.convert<bool>(json['isSelected']);
+  if (isSelected != null) {
+    ukLabourRequestPreselectAddstaffListRows.isSelected = isSelected;
+  }
+  return ukLabourRequestPreselectAddstaffListRows;
+}
+
+Map<String, dynamic> $UkLabourRequestPreselectAddstaffListRowsToJson(
+    UkLabourRequestPreselectAddstaffListRows entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['is_favourite'] = entity.isFavourite;
+  data['gender'] = entity.gender;
+  data['nric'] = entity.nric;
+  data['profile_picture'] = entity.profilePicture;
+  data['status'] = entity.status;
+  data['apply_state'] = entity.applyState;
+  data['isSelected'] = entity.isSelected;
+  return data;
+}
+
+extension UkLabourRequestPreselectAddstaffListRowsExtension on UkLabourRequestPreselectAddstaffListRows {
+  UkLabourRequestPreselectAddstaffListRows copyWith({
+    int? id,
+    String? name,
+    int? isFavourite,
+    String? gender,
+    String? nric,
+    String? profilePicture,
+    int? status,
+    int? applyState,
+    bool? isSelected,
+  }) {
+    return UkLabourRequestPreselectAddstaffListRows()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..isFavourite = isFavourite ?? this.isFavourite
+      ..gender = gender ?? this.gender
+      ..nric = nric ?? this.nric
+      ..profilePicture = profilePicture ?? this.profilePicture
+      ..status = status ?? this.status
+      ..applyState = applyState ?? this.applyState
+      ..isSelected = isSelected ?? this.isSelected;
+  }
+}

packages/cs_domain/lib/generated/json/uk_labour_request_preselect_addstatff_list_entity.g.dart

@@ -1,107 +0,0 @@
-import 'package:domain/generated/json/base/json_convert_content.dart';
-import 'package:domain/entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
-
-UkLabourRequestPreselectAddstatffListEntity $UkLabourRequestPreselectAddstatffListEntityFromJson(Map<String, dynamic> json) {
-  final UkLabourRequestPreselectAddstatffListEntity ukLabourRequestPreselectAddstatffListEntity = UkLabourRequestPreselectAddstatffListEntity();
-  final int? total = jsonConvert.convert<int>(json['total']);
-  if (total != null) {
-    ukLabourRequestPreselectAddstatffListEntity.total = total;
-  }
-  final List<UkLabourRequestPreselectAddstatffListRows>? rows = (json['rows'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UkLabourRequestPreselectAddstatffListRows>(e) as UkLabourRequestPreselectAddstatffListRows).toList();
-  if (rows != null) {
-    ukLabourRequestPreselectAddstatffListEntity.rows = rows;
-  }
-  return ukLabourRequestPreselectAddstatffListEntity;
-}
-
-Map<String, dynamic> $UkLabourRequestPreselectAddstatffListEntityToJson(UkLabourRequestPreselectAddstatffListEntity entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['total'] = entity.total;
-  data['rows'] = entity.rows?.map((v) => v.toJson()).toList();
-  return data;
-}
-
-extension UkLabourRequestPreselectAddstatffListEntityExtension on UkLabourRequestPreselectAddstatffListEntity {
-  UkLabourRequestPreselectAddstatffListEntity copyWith({
-    int? total,
-    List<UkLabourRequestPreselectAddstatffListRows>? rows,
-  }) {
-    return UkLabourRequestPreselectAddstatffListEntity()
-      ..total = total ?? this.total
-      ..rows = rows ?? this.rows;
-  }
-}
-
-UkLabourRequestPreselectAddstatffListRows $UkLabourRequestPreselectAddstatffListRowsFromJson(Map<String, dynamic> json) {
-  final UkLabourRequestPreselectAddstatffListRows ukLabourRequestPreselectAddstatffListRows = UkLabourRequestPreselectAddstatffListRows();
-  final int? id = jsonConvert.convert<int>(json['id']);
-  if (id != null) {
-    ukLabourRequestPreselectAddstatffListRows.id = id;
-  }
-  final String? name = jsonConvert.convert<String>(json['name']);
-  if (name != null) {
-    ukLabourRequestPreselectAddstatffListRows.name = name;
-  }
-  final String? gender = jsonConvert.convert<String>(json['gender']);
-  if (gender != null) {
-    ukLabourRequestPreselectAddstatffListRows.gender = gender;
-  }
-  final String? nric = jsonConvert.convert<String>(json['nric']);
-  if (nric != null) {
-    ukLabourRequestPreselectAddstatffListRows.nric = nric;
-  }
-  final String? profilePicture = jsonConvert.convert<String>(json['profile_picture']);
-  if (profilePicture != null) {
-    ukLabourRequestPreselectAddstatffListRows.profilePicture = profilePicture;
-  }
-  final int? status = jsonConvert.convert<int>(json['status']);
-  if (status != null) {
-    ukLabourRequestPreselectAddstatffListRows.status = status;
-  }
-  final int? applyState = jsonConvert.convert<int>(json['apply_state']);
-  if (applyState != null) {
-    ukLabourRequestPreselectAddstatffListRows.applyState = applyState;
-  }
-  final bool? isSelected = jsonConvert.convert<bool>(json['isSelected']);
-  if (isSelected != null) {
-    ukLabourRequestPreselectAddstatffListRows.isSelected = isSelected;
-  }
-  return ukLabourRequestPreselectAddstatffListRows;
-}
-
-Map<String, dynamic> $UkLabourRequestPreselectAddstatffListRowsToJson(UkLabourRequestPreselectAddstatffListRows entity) {
-  final Map<String, dynamic> data = <String, dynamic>{};
-  data['id'] = entity.id;
-  data['name'] = entity.name;
-  data['gender'] = entity.gender;
-  data['nric'] = entity.nric;
-  data['profile_picture'] = entity.profilePicture;
-  data['status'] = entity.status;
-  data['apply_state'] = entity.applyState;
-  data['isSelected'] = entity.isSelected;
-  return data;
-}
-
-extension UkLabourRequestPreselectAddstatffListRowsExtension on UkLabourRequestPreselectAddstatffListRows {
-  UkLabourRequestPreselectAddstatffListRows copyWith({
-    int? id,
-    String? name,
-    String? gender,
-    String? nric,
-    String? profilePicture,
-    int? status,
-    int? applyState,
-    bool? isSelected,
-  }) {
-    return UkLabourRequestPreselectAddstatffListRows()
-      ..id = id ?? this.id
-      ..name = name ?? this.name
-      ..gender = gender ?? this.gender
-      ..nric = nric ?? this.nric
-      ..profilePicture = profilePicture ?? this.profilePicture
-      ..status = status ?? this.status
-      ..applyState = applyState ?? this.applyState
-      ..isSelected = isSelected ?? this.isSelected;
-  }
-}

packages/cs_domain/lib/generated/json/uk_template_detail_entity.g.dart

@@ -35,6 +35,15 @@ UkTemplateDetailEntity $UkTemplateDetailEntityFromJson(Map<String, dynamic> json
   if (vehicleList != null) {
     ukTemplateDetailEntity.vehicleList = vehicleList;
   }
+  final List<
+      UkTemplateDetailChallenge25List>? challenge25List = (json['challenge_25_list'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<UkTemplateDetailChallenge25List>(
+          e) as UkTemplateDetailChallenge25List).toList();
+  if (challenge25List != null) {
+    ukTemplateDetailEntity.challenge25List = challenge25List;
+  }
   return ukTemplateDetailEntity;
 }
 
@@ -47,6 +56,8 @@ Map<String, dynamic> $UkTemplateDetailEntityToJson(UkTemplateDetailEntity entity
   data['title_list'] = entity.titleList?.map((v) => v.toJson()).toList();
   data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
+  data['challenge_25_list'] =
+      entity.challenge25List?.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -59,6 +70,7 @@ extension UkTemplateDetailEntityExtension on UkTemplateDetailEntity {
     List<UkTemplateDetailTitleList>? titleList,
     List<UkTemplateDetailCertificateList>? certificateList,
     List<UkTemplateDetailVehicleList>? vehicleList,
+    List<UkTemplateDetailChallenge25List>? challenge25List,
   }) {
     return UkTemplateDetailEntity()
       ..row = row ?? this.row
@@ -67,7 +79,8 @@ extension UkTemplateDetailEntityExtension on UkTemplateDetailEntity {
       ..templateTitle = templateTitle ?? this.templateTitle
       ..titleList = titleList ?? this.titleList
       ..certificateList = certificateList ?? this.certificateList
-      ..vehicleList = vehicleList ?? this.vehicleList;
+      ..vehicleList = vehicleList ?? this.vehicleList
+      ..challenge25List = challenge25List ?? this.challenge25List;
   }
 }
 
@@ -145,6 +158,14 @@ UkTemplateDetailRow $UkTemplateDetailRowFromJson(Map<String, dynamic> json) {
   if (jobTitleId != null) {
     ukTemplateDetailRow.jobTitleId = jobTitleId;
   }
+  final String? clientName = jsonConvert.convert<String>(json['client_name']);
+  if (clientName != null) {
+    ukTemplateDetailRow.clientName = clientName;
+  }
+  final int? challenge25 = jsonConvert.convert<int>(json['challenge_25']);
+  if (challenge25 != null) {
+    ukTemplateDetailRow.challenge25 = challenge25;
+  }
   return ukTemplateDetailRow;
 }
 
@@ -168,6 +189,8 @@ Map<String, dynamic> $UkTemplateDetailRowToJson(UkTemplateDetailRow entity) {
   data['deleted_at'] = entity.deletedAt;
   data['template_id'] = entity.templateId;
   data['job_title_id'] = entity.jobTitleId;
+  data['client_name'] = entity.clientName;
+  data['challenge_25'] = entity.challenge25;
   return data;
 }
 
@@ -191,6 +214,8 @@ extension UkTemplateDetailRowExtension on UkTemplateDetailRow {
     dynamic deletedAt,
     int? templateId,
     int? jobTitleId,
+    String? clientName,
+    int? challenge25,
   }) {
     return UkTemplateDetailRow()
       ..id = id ?? this.id
@@ -210,7 +235,9 @@ extension UkTemplateDetailRowExtension on UkTemplateDetailRow {
       ..updatedAt = updatedAt ?? this.updatedAt
       ..deletedAt = deletedAt ?? this.deletedAt
       ..templateId = templateId ?? this.templateId
-      ..jobTitleId = jobTitleId ?? this.jobTitleId;
+      ..jobTitleId = jobTitleId ?? this.jobTitleId
+      ..clientName = clientName ?? this.clientName
+      ..challenge25 = challenge25 ?? this.challenge25;
   }
 }
 
@@ -319,4 +346,44 @@ extension UkTemplateDetailVehicleListExtension on UkTemplateDetailVehicleList {
       ..txt = txt ?? this.txt
       ..checked = checked ?? this.checked;
   }
+}
+
+UkTemplateDetailChallenge25List $UkTemplateDetailChallenge25ListFromJson(
+    Map<String, dynamic> json) {
+  final UkTemplateDetailChallenge25List ukTemplateDetailChallenge25List = UkTemplateDetailChallenge25List();
+  final int? value = jsonConvert.convert<int>(json['value']);
+  if (value != null) {
+    ukTemplateDetailChallenge25List.value = value;
+  }
+  final String? txt = jsonConvert.convert<String>(json['txt']);
+  if (txt != null) {
+    ukTemplateDetailChallenge25List.txt = txt;
+  }
+  final String? checked = jsonConvert.convert<String>(json['checked']);
+  if (checked != null) {
+    ukTemplateDetailChallenge25List.checked = checked;
+  }
+  return ukTemplateDetailChallenge25List;
+}
+
+Map<String, dynamic> $UkTemplateDetailChallenge25ListToJson(
+    UkTemplateDetailChallenge25List entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['value'] = entity.value;
+  data['txt'] = entity.txt;
+  data['checked'] = entity.checked;
+  return data;
+}
+
+extension UkTemplateDetailChallenge25ListExtension on UkTemplateDetailChallenge25List {
+  UkTemplateDetailChallenge25List copyWith({
+    int? value,
+    String? txt,
+    String? checked,
+  }) {
+    return UkTemplateDetailChallenge25List()
+      ..value = value ?? this.value
+      ..txt = txt ?? this.txt
+      ..checked = checked ?? this.checked;
+  }
 }

packages/cs_domain/lib/generated/json/uk_template_detail_index_entity.g.dart

@@ -18,6 +18,15 @@ UkTemplateDetailIndexEntity $UkTemplateDetailIndexEntityFromJson(Map<String, dyn
   if (vehicleList != null) {
     ukTemplateDetailIndexEntity.vehicleList = vehicleList;
   }
+  final List<
+      UkTemplateDetailIndexChallenge25List>? challenge25List = (json['challenge_25_list'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<UkTemplateDetailIndexChallenge25List>(
+          e) as UkTemplateDetailIndexChallenge25List).toList();
+  if (challenge25List != null) {
+    ukTemplateDetailIndexEntity.challenge25List = challenge25List;
+  }
   return ukTemplateDetailIndexEntity;
 }
 
@@ -26,6 +35,8 @@ Map<String, dynamic> $UkTemplateDetailIndexEntityToJson(UkTemplateDetailIndexEnt
   data['template_list'] = entity.templateList;
   data['certificate_list'] = entity.certificateList?.map((v) => v.toJson()).toList();
   data['vehicle_list'] = entity.vehicleList?.map((v) => v.toJson()).toList();
+  data['challenge_25_list'] =
+      entity.challenge25List?.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -34,11 +45,13 @@ extension UkTemplateDetailIndexEntityExtension on UkTemplateDetailIndexEntity {
     List<String>? templateList,
     List<UkTemplateDetailIndexCertificateList>? certificateList,
     List<UkTemplateDetailIndexVehicleList>? vehicleList,
+    List<UkTemplateDetailIndexChallenge25List>? challenge25List,
   }) {
     return UkTemplateDetailIndexEntity()
       ..templateList = templateList ?? this.templateList
       ..certificateList = certificateList ?? this.certificateList
-      ..vehicleList = vehicleList ?? this.vehicleList;
+      ..vehicleList = vehicleList ?? this.vehicleList
+      ..challenge25List = challenge25List ?? this.challenge25List;
   }
 }
 
@@ -116,4 +129,44 @@ extension UkTemplateDetailIndexVehicleListExtension on UkTemplateDetailIndexVehi
       ..txt = txt ?? this.txt
       ..checked = checked ?? this.checked;
   }
+}
+
+UkTemplateDetailIndexChallenge25List $UkTemplateDetailIndexChallenge25ListFromJson(
+    Map<String, dynamic> json) {
+  final UkTemplateDetailIndexChallenge25List ukTemplateDetailIndexChallenge25List = UkTemplateDetailIndexChallenge25List();
+  final int? value = jsonConvert.convert<int>(json['value']);
+  if (value != null) {
+    ukTemplateDetailIndexChallenge25List.value = value;
+  }
+  final String? txt = jsonConvert.convert<String>(json['txt']);
+  if (txt != null) {
+    ukTemplateDetailIndexChallenge25List.txt = txt;
+  }
+  final String? checked = jsonConvert.convert<String>(json['checked']);
+  if (checked != null) {
+    ukTemplateDetailIndexChallenge25List.checked = checked;
+  }
+  return ukTemplateDetailIndexChallenge25List;
+}
+
+Map<String, dynamic> $UkTemplateDetailIndexChallenge25ListToJson(
+    UkTemplateDetailIndexChallenge25List entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['value'] = entity.value;
+  data['txt'] = entity.txt;
+  data['checked'] = entity.checked;
+  return data;
+}
+
+extension UkTemplateDetailIndexChallenge25ListExtension on UkTemplateDetailIndexChallenge25List {
+  UkTemplateDetailIndexChallenge25List copyWith({
+    int? value,
+    String? txt,
+    String? checked,
+  }) {
+    return UkTemplateDetailIndexChallenge25List()
+      ..value = value ?? this.value
+      ..txt = txt ?? this.txt
+      ..checked = checked ?? this.checked;
+  }
 }

packages/cs_domain/lib/generated/json/uk_template_table_entity.g.dart

@@ -0,0 +1,126 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/response/uk_template_table_entity.dart';
+
+UkTemplateTableEntity $UkTemplateTableEntityFromJson(
+    Map<String, dynamic> json) {
+  final UkTemplateTableEntity ukTemplateTableEntity = UkTemplateTableEntity();
+  final int? total = jsonConvert.convert<int>(json['total']);
+  if (total != null) {
+    ukTemplateTableEntity.total = total;
+  }
+  final List<UkTemplateTableRows>? rows = (json['rows'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<UkTemplateTableRows>(e) as UkTemplateTableRows)
+      .toList();
+  if (rows != null) {
+    ukTemplateTableEntity.rows = rows;
+  }
+  return ukTemplateTableEntity;
+}
+
+Map<String, dynamic> $UkTemplateTableEntityToJson(
+    UkTemplateTableEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['total'] = entity.total;
+  data['rows'] = entity.rows?.map((v) => v.toJson()).toList();
+  return data;
+}
+
+extension UkTemplateTableEntityExtension on UkTemplateTableEntity {
+  UkTemplateTableEntity copyWith({
+    int? total,
+    List<UkTemplateTableRows>? rows,
+  }) {
+    return UkTemplateTableEntity()
+      ..total = total ?? this.total
+      ..rows = rows ?? this.rows;
+  }
+}
+
+UkTemplateTableRows $UkTemplateTableRowsFromJson(Map<String, dynamic> json) {
+  final UkTemplateTableRows ukTemplateTableRows = UkTemplateTableRows();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    ukTemplateTableRows.id = id;
+  }
+  final String? jobTitle = jsonConvert.convert<String>(json['job_title']);
+  if (jobTitle != null) {
+    ukTemplateTableRows.jobTitle = jobTitle;
+  }
+  final String? clientName = jsonConvert.convert<String>(json['client_name']);
+  if (clientName != null) {
+    ukTemplateTableRows.clientName = clientName;
+  }
+  final String? contactName = jsonConvert.convert<String>(json['contact_name']);
+  if (contactName != null) {
+    ukTemplateTableRows.contactName = contactName;
+  }
+  final String? contactNo = jsonConvert.convert<String>(json['contact_no']);
+  if (contactNo != null) {
+    ukTemplateTableRows.contactNo = contactNo;
+  }
+  final String? challenge25 = jsonConvert.convert<String>(json['challenge_25']);
+  if (challenge25 != null) {
+    ukTemplateTableRows.challenge25 = challenge25;
+  }
+  final String? vehicle = jsonConvert.convert<String>(json['vehicle']);
+  if (vehicle != null) {
+    ukTemplateTableRows.vehicle = vehicle;
+  }
+  final String? certificate = jsonConvert.convert<String>(json['certificate']);
+  if (certificate != null) {
+    ukTemplateTableRows.certificate = certificate;
+  }
+  final String? createdBy = jsonConvert.convert<String>(json['created_by']);
+  if (createdBy != null) {
+    ukTemplateTableRows.createdBy = createdBy;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    ukTemplateTableRows.createdAt = createdAt;
+  }
+  return ukTemplateTableRows;
+}
+
+Map<String, dynamic> $UkTemplateTableRowsToJson(UkTemplateTableRows entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['job_title'] = entity.jobTitle;
+  data['client_name'] = entity.clientName;
+  data['contact_name'] = entity.contactName;
+  data['contact_no'] = entity.contactNo;
+  data['challenge_25'] = entity.challenge25;
+  data['vehicle'] = entity.vehicle;
+  data['certificate'] = entity.certificate;
+  data['created_by'] = entity.createdBy;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension UkTemplateTableRowsExtension on UkTemplateTableRows {
+  UkTemplateTableRows copyWith({
+    int? id,
+    String? jobTitle,
+    String? clientName,
+    String? contactName,
+    String? contactNo,
+    String? challenge25,
+    String? vehicle,
+    String? certificate,
+    String? createdBy,
+    String? createdAt,
+  }) {
+    return UkTemplateTableRows()
+      ..id = id ?? this.id
+      ..jobTitle = jobTitle ?? this.jobTitle
+      ..clientName = clientName ?? this.clientName
+      ..contactName = contactName ?? this.contactName
+      ..contactNo = contactNo ?? this.contactNo
+      ..challenge25 = challenge25 ?? this.challenge25
+      ..vehicle = vehicle ?? this.vehicle
+      ..certificate = certificate ?? this.certificate
+      ..createdBy = createdBy ?? this.createdBy
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}

packages/cs_domain/lib/repository/uk_job_repository.dart

@@ -1,4 +1,3 @@
-import 'package:domain/entity/response/u_k_template_entity.dart';
 import 'package:get/get.dart';
 import 'package:plugin_platform/http/http_provider.dart';
 import 'package:plugin_platform/http/http_result.dart';
@@ -20,6 +19,7 @@ import '../entity/response/uk_staff_detail_entity.dart';
 import '../entity/response/uk_staff_labour_history_entity.dart';
 import '../entity/response/uk_template_detail_entity.dart';
 import '../entity/response/uk_template_detail_index_entity.dart';
+import '../entity/response/uk_template_table_entity.dart';
 import '../entity/response/uk_template_title_option_entity.dart';
 
 /// UK工作相关数据仓库
@@ -29,7 +29,7 @@ class UKJobRepository extends GetxService {
   UKJobRepository({required this.httpProvider});
 
   /// 用工模版中的工作标题列表
-  Future<HttpResult<UKTemplateEntity>> fetchJobTemplateList(
+  Future<HttpResult<UkTemplateTableEntity>> fetchJobTemplateList(
     String? keyword, {
     required int curPage,
     CancelToken? cancelToken,
@@ -51,8 +51,8 @@ class UKJobRepository extends GetxService {
 
     if (result.isSuccess) {
       final json = result.getDataJson();
-      var data = UKTemplateEntity.fromJson(json!);
-      return result.convert<UKTemplateEntity>(data: data);
+      var data = UkTemplateTableEntity.fromJson(json!);
+      return result.convert<UkTemplateTableEntity>(data: data);
     }
     return result.convert();
   }
@@ -155,8 +155,10 @@ class UKJobRepository extends GetxService {
   Future<HttpResult> addJobTemplateSubmit({
     required String jobTemplateId ,
     required String jobTitle,
+    String? clientName,
     List<String>? certificate,
     List<String>? vehicle,
+    String? challenge25, // 1.yes,0.no
     String? note,
     String? desc,
     String? contactName,
@@ -169,12 +171,19 @@ class UKJobRepository extends GetxService {
     params['job_template_id'] = jobTemplateId;
     params['job_title'] = jobTitle;
 
+    if (Utils.isNotEmpty(clientName)) {
+      params['client_name'] = clientName ?? "";
+    }
+
     if (certificate != null && certificate.isNotEmpty) {
       params['certificate[]'] = certificate;
     }
     if (vehicle != null && vehicle.isNotEmpty) {
       params['vehicle[]'] = vehicle;
     }
+    if (Utils.isNotEmpty(challenge25)) {
+      params['challenge_25'] = challenge25 ?? "";
+    }
     if (Utils.isNotEmpty(note)) {
       params['note'] = note ?? "";
     }
@@ -208,8 +217,10 @@ class UKJobRepository extends GetxService {
     required String templateId,
     required String jobTemplateId,
     required String jobTitle,
+    String? clientName,
     List<String>? certificate,
     List<String>? vehicle,
+    String? challenge25, // 1 yse  0 no
     String? note,
     String? desc,
     String? contactName,
@@ -222,12 +233,19 @@ class UKJobRepository extends GetxService {
     params['template_id'] = templateId;
     params['job_template_id'] = jobTemplateId;
 
+    if (Utils.isNotEmpty(clientName)) {
+      params['client_name'] = clientName ?? "";
+    }
+
     if (certificate != null && certificate.isNotEmpty) {
       params['certificate[]'] = certificate;
     }
     if (vehicle != null && vehicle.isNotEmpty) {
       params['vehicle[]'] = vehicle;
     }
+    if (Utils.isNotEmpty(challenge25)) {
+      params['challenge_25'] = challenge25 ?? "";
+    }
     if (Utils.isNotEmpty(note)) {
       params['note'] = note ?? "";
     }

packages/cs_domain/lib/repository/uk_labour_repository.dart

@@ -13,7 +13,7 @@ import 'package:shared/utils/util.dart';
 import '../constants/api_constants.dart';
 import '../entity/response/uk_lab_req_show_template_entity.dart';
 import '../entity/response/uk_labour_request_detail_entity.dart';
-import '../entity/response/uk_labour_request_preselect_addstatff_list_entity.dart';
+import '../entity/response/uk_labour_request_preselect_addstaff_list_entity.dart';
 import '../entity/response/uk_labour_request_preselected_list_entity.dart';
 import '../entity/response/uk_labour_request_table_entity.dart';
 import '../entity/response/uk_labour_review_status_entity.dart';
@@ -145,6 +145,7 @@ class UkLabourRepository extends GetxService {
     if (result.isSuccess) {
       //重新赋值data或list
       final json = result.getDataJson();
+
       var data = UkLabReqShowTemplateEntity.fromJson(json!);
       //重新赋值data或list
       return result.convert<UkLabReqShowTemplateEntity>(data: data);
@@ -205,6 +206,11 @@ class UkLabourRepository extends GetxService {
       String? position,
       String? estCost,
       dynamic? attUrl,
+      String? videoText,
+      dynamic? videoCover,
+      dynamic? video,
+      dynamic? otherImage,
+      dynamic? otherDocument,
       CancelToken? cancelToken,
     }) async {
 
@@ -259,6 +265,49 @@ class UkLabourRepository extends GetxService {
       }
     }
 
+    // 视频部分的参数
+    params['video_text'] = videoText ?? "";
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(videoCover)){
+      if(videoCover!.startsWith("http") || videoCover!.startsWith("https")){
+        params['video_cover'] = videoCover;
+      }else {
+        filePathParams['video_cover'] = videoCover;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(video)){
+      if(video!.startsWith("http") || video!.startsWith("https")){
+        params['video'] = video;
+      }else {
+        filePathParams['video'] = video;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherImage)){
+      if(otherImage!.startsWith("http") || otherImage!.startsWith("https")){
+        params['other_image'] = otherImage;
+      }else {
+        filePathParams['other_image'] = otherImage;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherDocument)){
+      if(otherDocument!.startsWith("http") || otherDocument!.startsWith("https")){
+        params['other_document'] = otherDocument;
+      }else {
+        filePathParams['other_document'] = otherDocument;
+      }
+    }
+
 
 
     final result = await httpProvider.requestNetResult(
@@ -302,6 +351,11 @@ class UkLabourRepository extends GetxService {
     String? position,
     String? estCost,
     dynamic? attUrl,
+    String? videoText,
+    dynamic? videoCover,
+    dynamic? video,
+    dynamic? otherImage,
+    dynamic? otherDocument,
     CancelToken? cancelToken,
   }) async {
 
@@ -356,7 +410,48 @@ class UkLabourRepository extends GetxService {
       }
     }
 
+    // 视频部分的参数
+    params['video_text'] = videoText ?? "";
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(videoCover)){
+      if(videoCover!.startsWith("http") || videoCover!.startsWith("https")){
+        params['video_cover'] = videoCover;
+      }else {
+        filePathParams['video_cover'] = videoCover;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(video)){
+      if(video!.startsWith("http") || video!.startsWith("https")){
+        params['video'] = video;
+      }else {
+        filePathParams['video'] = video;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherImage)){
+      if(otherImage!.startsWith("http") || otherImage!.startsWith("https")){
+        params['other_image'] = otherImage;
+      }else {
+        filePathParams['other_image'] = otherImage;
+      }
+    }
 
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherDocument)){
+      if(otherDocument!.startsWith("http") || otherDocument!.startsWith("https")){
+        params['other_document'] = otherDocument;
+      }else {
+        filePathParams['other_document'] = otherDocument;
+      }
+    }
 
     final result = await httpProvider.requestNetResult(
       ApiConstants.apiLabourRequestReViewEditUK,
@@ -400,6 +495,11 @@ class UkLabourRepository extends GetxService {
     String? position,
     String? estCost,
     dynamic? attUrl,
+    String? videoText,
+    dynamic? videoCover,
+    dynamic? video,
+    dynamic? otherImage,
+    dynamic? otherDocument,
     CancelToken? cancelToken,
   }) async {
     //参数
@@ -456,6 +556,49 @@ class UkLabourRepository extends GetxService {
       }
     }
 
+    // 视频部分的参数
+    params['video_text'] = videoText ?? "";
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(videoCover)){
+      if(videoCover!.startsWith("http") || videoCover!.startsWith("https")){
+        params['video_cover'] = videoCover;
+      }else {
+        filePathParams['video_cover'] = videoCover;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(video)){
+      if(video!.startsWith("http") || video!.startsWith("https")){
+        params['video'] = video;
+      }else {
+        filePathParams['video'] = video;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherImage)){
+      if(otherImage!.startsWith("http") || otherImage!.startsWith("https")){
+        params['other_image'] = otherImage;
+      }else {
+        filePathParams['other_image'] = otherImage;
+      }
+    }
+
+    //可能是file 也可能是  url
+    // 判断 http 或者 https 开头
+    if(Utils.isNotEmpty(otherDocument)){
+      if(otherDocument!.startsWith("http") || otherDocument!.startsWith("https")){
+        params['other_document'] = otherDocument;
+      }else {
+        filePathParams['other_document'] = otherDocument;
+      }
+    }
+
 
     final result = await httpProvider.requestNetResult(
       ApiConstants.apiLabourRequestAddSubmit,
@@ -546,7 +689,7 @@ class UkLabourRepository extends GetxService {
 
 
   /// 预选人-添加员工的列表
-  Future<HttpResult<UkLabourRequestPreselectAddstatffListEntity>> fetchtPreselectedAddStaffList(
+  Future<HttpResult<UkLabourRequestPreselectAddstaffListEntity>> fetchtPreselectedAddStaffList(
       String? keyWord,
       String? reQuestId,
       {
@@ -576,9 +719,9 @@ class UkLabourRepository extends GetxService {
     if (result.isSuccess) {
       //重新赋值data或list
       final json = result.getDataJson();
-      var data = UkLabourRequestPreselectAddstatffListEntity.fromJson(json!);
+      var data = UkLabourRequestPreselectAddstaffListEntity.fromJson(json!);
       //重新赋值data或list
-      return result.convert<UkLabourRequestPreselectAddstatffListEntity>(data: data);
+      return result.convert<UkLabourRequestPreselectAddstaffListEntity>(data: data);
     }
     return result.convert();
   }

packages/cs_resources/lib/local/language/en_US.dart

@@ -367,6 +367,13 @@ const Map<String, String> en_US = {
   'YY Casual Report By Payout Date (Based the Client Rate)': 'YY Casual Report By Payout Date (Based the Client Rate)',
   'Count': 'Count',
   'Gratuity': 'Gratuity',
+  'Name': 'Name',
+  'Industry': 'Industry',
+  'Video': 'Video',
+  'Video Text': 'Video Text',
+  'Video Cover': 'Video Cover',
+  'Video Image': 'Video Image',
+  'Video Document': 'Video Document',
 
   //插件的国际化
   'Pull to refresh': 'Pull to refresh',

packages/cs_resources/lib/local/language/zh_CN.dart

@@ -368,6 +368,13 @@ const Map<String, String> zh_CN = {
   'YY Casual Report By Payout Date (Based the Client Rate)': '按支付日期的报告（基于客户费率）',
   'Count': '总数量',
   'Gratuity': '小费',
+  'Name': '名称',
+  'Industry': '行业',
+  'Video': '视频',
+  'Video Text': '视频文字',
+  'Video Cover': '视频封面',
+  'Video Image': '视频图片',
+  'Video Document': '视频文档',
 
   //插件的国际化
   'Pull to refresh': '下拉刷新',