Merge branch 'master' of http://git.wmzhubo.com/guadoutech/YY-Hotel-Business-ER

app/android/app/build.gradle

@@ -47,11 +47,11 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.hongyegroup.hotelbusiness"
+        applicationId "com.guadou.yyemployer"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 100          //Android打包上线记得要加固并重新签名再传
-        versionName "1.0.0"
+        versionCode 300          //Android打包上线记得要加固并重新签名再传
+        versionName "3.0.0"
 
         multiDexEnabled true
 

app/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hongyegroup.hotelbusiness">
+    package="com.guadou.yyemployer">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -42,13 +42,13 @@
         android:name=".MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="YYBusiness-ER"
+        android:label="YY Employer"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:usesCleartextTraffic="true">
 
         <activity
-            android:name="app.android.app.src.main.kotlin.com.hongyegroup.hotelbusiness.MainActivity"
+            android:name="android.app.src.main.kotlin.com.guadou.yyemployer.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"

app/android/app/src/main/kotlin/com/hongyegroup/hotelbusiness/MainActivity.java

@@ -1,4 +1,4 @@
-package app.android.app.src.main.kotlin.com.hongyegroup.hotelbusiness;
+package android.app.src.main.kotlin.com.guadou.yyemployer;
 
 import android.os.Bundle;
 import android.util.Log;

app/android/app/src/main/kotlin/com/hongyegroup/hotelbusiness/MyApplication.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.hotelbusiness
+package com.guadou.yyemployer
 
 import android.content.Context
 import androidx.multidex.MultiDex

app/android/app/src/main/kotlin/com/hongyegroup/hotelbusiness/RouterActivity.java

@@ -1,4 +1,4 @@
-//package com.hongyegroup.hotelbusiness;
+//package com.guadou.yyemployer;
 //
 //import android.app.Activity;
 //import android.content.Intent;

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

app/lib/modules/splash/splash_page.dart

@@ -39,8 +39,8 @@ class SplashPage extends BaseStatelessPage<SplashController> {
         child: const Center(
           child: MyAssetImage(
             Assets.assetsYyBusinessTopLogo,
-            width: 164.5,
-            height: 101,
+            width: 166,
+            height: 67.5,
             fit: BoxFit.contain,
           ),
         ),

packages/cpt_auth/lib/modules/login/login_page.dart

@@ -1,5 +1,6 @@
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:cs_resources/generated/assets.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -9,6 +10,7 @@ import 'package:plugin_basic/base/base_state.dart';
 import 'package:plugin_basic/base/mixin_state_lifecycle.dart';
 import 'package:plugin_basic/utils/ext_get_nav.dart';
 import 'package:router/path/router_path.dart';
+import 'package:shared/utils/device_utils.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/screen_util.dart';
 import 'package:widgets/custom_radio_check.dart';
@@ -219,7 +221,10 @@ class _MainPageState extends BaseState<LoginPage, LoginController> with StateLif
                                 ),
 
                                 //注册入口
-                                _buildRichText(),
+                                Visibility(
+                                  visible: !DeviceUtils.isAndroid,
+                                  child: _buildRichText(),
+                                ),
                               ],
                             ),
                           ), // 传递子部件

packages/cpt_auth/lib/modules/setting/setting_page.dart

@@ -57,9 +57,9 @@ class SettingPage extends BaseStatelessPage<SettingController> {
           ),
           child: Column(children: [
             SizedBox(height: 10),
-            SettingItemContainer(iconPath: Assets.mainSettingSwitchProject, title: "Switch Projects".tr).onTap(() {
-              controller.switchProjects();
-            }),
+            // SettingItemContainer(iconPath: Assets.mainSettingSwitchProject, title: "Switch Projects".tr).onTap(() {
+            //   controller.switchProjects();
+            // }),
             SettingItemContainer(iconPath: Assets.mainSettingResetPassword, title: "Reset Password".tr).onTap(() {
               controller.gotoResetPasswordPage();
             }),

packages/cpt_job/lib/modules/applied_staff_reviews/applied_staff_reviews_page.dart

@@ -128,7 +128,7 @@ class _AppliedStaffReviewsState extends BaseState<AppliedStaffReviewsPage, Appli
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           MyTextView(
-            "Job History",
+            state.staffName ?? "-",
             fontSize: 17,
             textColor: ColorConstants.white,
             isFontMedium: true,

packages/cpt_job/lib/modules/job_list/job_list_filter.dart

@@ -21,7 +21,6 @@ import 'package:widgets/widget_export.dart';
  * 用工请求列表的筛选
  */
 class JobListFilter extends StatefulWidget {
-
   void Function(DateTime? selectedStartDate, DateTime? selectedEndDate, String? selectedStatusId, String? selectedDepartmentId)? onFilterAction;
   JobListIndexEntity optionResult;
   DateTime? selectedStartDate;
@@ -98,7 +97,7 @@ class _JobListFilterState extends State<JobListFilter> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     MyTextView(
-                      selectedDepartmentId == null
+                      selectedDepartmentId == null || selectedDepartmentId == "0"
                           ? ""
                           : widget.optionResult.departmentList!.firstWhere((element) => element.value.toString() == selectedDepartmentId).txt!,
                       hint: "Choose Outlet".tr,
@@ -138,7 +137,7 @@ class _JobListFilterState extends State<JobListFilter> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     MyTextView(
-                      selectedStatusId == null
+                      selectedStatusId == null || selectedStatusId == "0"
                           ? ""
                           : widget.optionResult.statusList!.firstWhere((element) => element.value.toString() == selectedStatusId).txt!,
                       fontSize: 14,
@@ -247,7 +246,6 @@ class _JobListFilterState extends State<JobListFilter> {
                         selectedStatusId = null;
                         selectedDepartmentId = null;
                       });
-
                     },
                     text: "Reset".tr,
                     textColor: ColorConstants.white,

packages/cpt_job/lib/modules/job_list_detail/job_list_detail_controller.dart

@@ -25,7 +25,7 @@ class JobListDetailController extends GetxController with DioCancelableMixin {
       var needNumController = state.formData['no_of_staff']!['controller'];
       needNumController.text = state.noStaff;
       state.selectedJobTitle = state.jobListDetail?.jobTitle;
-      state.selectedDepartmentId = state.jobListDetail?.departmentId.toString();
+      state.selectedDepartmentId = state.jobListDetail?.departmentId;
 
       update();
     } else {

packages/cpt_job/lib/modules/job_list_detail/job_list_detail_page.dart

@@ -1,5 +1,6 @@
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:cs_resources/generated/assets.dart';
+import 'package:domain/entity/response/job_list_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -187,10 +188,11 @@ class _JobListDetailState extends BaseState<JobListDetailPage, JobListDetailCont
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
                             MyTextView(
-                              state.selectedDepartmentId == null
+                              state.selectedDepartmentId == null || state.selectedDepartmentId == "0"
                                   ? ""
-                                  : state.jobListDetail!.departmentList?.firstWhere((element) => element.value.toString() == state.selectedDepartmentId).txt ??
-                                      "",
+                                  : state.jobListDetail!.departmentList?.firstWhere((element) {
+                                        return element.value.toString() == state.selectedDepartmentId!;
+                                      }, orElse: () => JobListDetailDepartmentList()).txt ?? "",
                               fontSize: 14,
                               hint: "Choose Outlet".tr,
                               textHintColor: ColorConstants.textGrayAECAE5,

packages/cpt_labour/lib/modules/labour_request_add/labour_request_add_page.dart

@@ -1,5 +1,6 @@
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:cs_resources/generated/assets.dart';
+import 'package:domain/entity/response/labour_request_edit_index_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -110,9 +111,13 @@ class _LabourRequestAddState extends BaseState<LabourRequestAddPage, LabourReque
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
                             MyTextView(
-                              state.selectedTemplateId == null
+                              state.selectedTemplateId == null || state.selectedTemplateId != "0"
                                   ? ""
-                                  : state.labReqOption!.templateList.firstWhere((element) => element.value.toString() == state.selectedTemplateId).txt ?? "",
+                                  : state.labReqOption!.templateList
+                                          .firstWhere((element) => element.value.toString() == state.selectedTemplateId,
+                                              orElse: () => LabourRequestEditIndexTemplateList())
+                                          .txt ??
+                                      "",
                               fontSize: 14,
                               hint: "Choose Job Title".tr,
                               textHintColor: ColorConstants.textGrayAECAE5,
@@ -230,9 +235,12 @@ class _LabourRequestAddState extends BaseState<LabourRequestAddPage, LabourReque
                           mainAxisAlignment: MainAxisAlignment.start,
                           children: [
                             MyTextView(
-                              state.selectedDepartmentId == null
+                              state.selectedDepartmentId == null || state.selectedDepartmentId == "0"
                                   ? ""
-                                  : state.labReqOption!.departmentList?.firstWhere((element) => element.value.toString() == state.selectedDepartmentId).txt ??
+                                  : state.labReqOption!.departmentList
+                                          .firstWhere((element) => element.value.toString() == state.selectedDepartmentId,
+                                              orElse: () => LabourRequestEditIndexDepartmentList())
+                                          .txt ??
                                       "",
                               fontSize: 14,
                               hint: "Choose Outlet".tr,

packages/cpt_labour/lib/modules/labour_request_list/labour_request_filter.dart

@@ -23,7 +23,6 @@ import 'package:widgets/widget_export.dart';
  * 用工请求列表的筛选
  */
 class LabourRequestFilter extends StatefulWidget {
-
   void Function(DateTime? selectedStartDate, DateTime? selectedEndDate, String? selectedStatusId, String? selectedDepartmentId)? onFilterAction;
   LabourRequestIndexEntity optionResult;
   DateTime? selectedStartDate;
@@ -100,7 +99,7 @@ class _LabourRequestFilterState extends State<LabourRequestFilter> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     MyTextView(
-                      selectedDepartmentId == null
+                      selectedDepartmentId == null || selectedDepartmentId == "0"
                           ? ""
                           : widget.optionResult.departmentList!.firstWhere((element) => element.value.toString() == selectedDepartmentId).txt!,
                       hint: "Choose Outlet".tr,
@@ -140,7 +139,7 @@ class _LabourRequestFilterState extends State<LabourRequestFilter> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     MyTextView(
-                      selectedStatusId == null
+                      selectedStatusId == null || selectedStatusId == "0"
                           ? ""
                           : widget.optionResult.statusList!.firstWhere((element) => element.value.toString() == selectedStatusId).txt!,
                       fontSize: 14,
@@ -249,7 +248,6 @@ class _LabourRequestFilterState extends State<LabourRequestFilter> {
                         selectedStatusId = null;
                         selectedDepartmentId = null;
                       });
-
                     },
                     text: "Reset".tr,
                     textColor: ColorConstants.white,

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

@@ -6,7 +6,7 @@ export 'package:domain/generated/json/job_list_applied_work_flow_entity.g.dart';
 @JsonSerializable()
 class JobListAppliedWorkFlowEntity {
 	@JSONField(name: "department_id")
-	int departmentId = 0;
+	String? departmentId = null;
 	List<JobListAppliedWorkFlowRecords>? records = [];
 
 	JobListAppliedWorkFlowEntity();

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

@@ -12,7 +12,7 @@ class JobListDetailEntity {
 	@JSONField(name: "need_num")
 	int needNum = 0;
 	@JSONField(name: "department_id")
-	int departmentId = 0;
+	String? departmentId = null;
 	@JSONField(name: "start_time")
 	String? startTime = null;
 	@JSONField(name: "end_time")

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

@@ -6,7 +6,7 @@ export 'package:domain/generated/json/labour_request_work_flow_entity.g.dart';
 @JsonSerializable()
 class LabourRequestWorkFlowEntity {
 	@JSONField(name: "co_department_id")
-	int coDepartmentId = 0;
+	String? coDepartmentId = null;
 	List<LabourRequestWorkFlowRecords>? records = null;
 
 	LabourRequestWorkFlowEntity();

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

@@ -3,7 +3,7 @@ import 'package:domain/entity/response/job_list_applied_work_flow_entity.dart';
 
 JobListAppliedWorkFlowEntity $JobListAppliedWorkFlowEntityFromJson(Map<String, dynamic> json) {
   final JobListAppliedWorkFlowEntity jobListAppliedWorkFlowEntity = JobListAppliedWorkFlowEntity();
-  final int? departmentId = jsonConvert.convert<int>(json['department_id']);
+  final String? departmentId = jsonConvert.convert<String>(json['department_id']);
   if (departmentId != null) {
     jobListAppliedWorkFlowEntity.departmentId = departmentId;
   }
@@ -24,7 +24,7 @@ Map<String, dynamic> $JobListAppliedWorkFlowEntityToJson(JobListAppliedWorkFlowE
 
 extension JobListAppliedWorkFlowEntityExtension on JobListAppliedWorkFlowEntity {
   JobListAppliedWorkFlowEntity copyWith({
-    int? departmentId,
+    String? departmentId,
     List<JobListAppliedWorkFlowRecords>? records,
   }) {
     return JobListAppliedWorkFlowEntity()

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

@@ -15,7 +15,7 @@ JobListDetailEntity $JobListDetailEntityFromJson(Map<String, dynamic> json) {
   if (needNum != null) {
     jobListDetailEntity.needNum = needNum;
   }
-  final int? departmentId = jsonConvert.convert<int>(json['department_id']);
+  final String? departmentId = jsonConvert.convert<String>(json['department_id']);
   if (departmentId != null) {
     jobListDetailEntity.departmentId = departmentId;
   }
@@ -52,7 +52,7 @@ extension JobListDetailEntityExtension on JobListDetailEntity {
     int? jobId,
     String? jobTitle,
     int? needNum,
-    int? departmentId,
+    String? departmentId,
     String? startTime,
     String? endTime,
     List<JobListDetailDepartmentList>? departmentList,

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

@@ -3,7 +3,7 @@ import 'package:domain/entity/response/labour_request_work_flow_entity.dart';
 
 LabourRequestWorkFlowEntity $LabourRequestWorkFlowEntityFromJson(Map<String, dynamic> json) {
   final LabourRequestWorkFlowEntity labourRequestWorkFlowEntity = LabourRequestWorkFlowEntity();
-  final int? coDepartmentId = jsonConvert.convert<int>(json['co_department_id']);
+  final String? coDepartmentId = jsonConvert.convert<String>(json['co_department_id']);
   if (coDepartmentId != null) {
     labourRequestWorkFlowEntity.coDepartmentId = coDepartmentId;
   }
@@ -24,7 +24,7 @@ Map<String, dynamic> $LabourRequestWorkFlowEntityToJson(LabourRequestWorkFlowEnt
 
 extension LabourRequestWorkFlowEntityExtension on LabourRequestWorkFlowEntity {
   LabourRequestWorkFlowEntity copyWith({
-    int? coDepartmentId,
+    String? coDepartmentId,
     List<LabourRequestWorkFlowRecords>? records,
   }) {
     return LabourRequestWorkFlowEntity()