Browse Source

跨天的工作的签到签出

liukai 2 months ago
parent
commit
e1fb1f4b8f

+ 43 - 43
packages/cpt_job_sg/lib/modules/job_applied/dialog_applied_modify.dart

@@ -52,12 +52,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: 16.5),
+      padding: const EdgeInsets.symmetric(horizontal: 16.5),
       width: 285,
       height: 510,
-      decoration: BoxDecoration(
+      decoration: const BoxDecoration(
         color: Colors.white,
-        borderRadius: const BorderRadius.all(Radius.circular(15)),
+        borderRadius: BorderRadius.all(Radius.circular(15)),
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -90,12 +90,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择时间
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -110,7 +110,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                         isFontMedium: true,
                         textColor: ColorConstants.black33,
                       ).expanded(),
-                      MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                      const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                     ],
                   ),
                 ).onTap(() {
@@ -128,12 +128,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择结束日期
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -148,7 +148,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                         isFontMedium: true,
                         textColor: ColorConstants.black33,
                       ).expanded(),
-                      MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                      const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                     ],
                   ),
                 ).onTap(() {
@@ -166,12 +166,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择结束日期
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -186,7 +186,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                         isFontMedium: true,
                         textColor: ColorConstants.black33,
                       ).expanded(),
-                      MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                      const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                     ],
                   ),
                 ).onTap(() {
@@ -203,12 +203,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择结束日期
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -223,7 +223,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                         isFontMedium: true,
                         textColor: ColorConstants.black33,
                       ).expanded(),
-                      MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                      const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                     ],
                   ),
                 ).onTap(() {
@@ -241,12 +241,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择结束日期
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -261,7 +261,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                         isFontMedium: true,
                         textColor: ColorConstants.black33,
                       ).expanded(),
-                      MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
+                      const MyAssetImage(Assets.baseServiceTriangleDropDownIcon, width: 11.5, height: 6.28),
                     ],
                   ),
                 ).onTap(() {
@@ -279,12 +279,12 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
                 //选择结束日期
                 Container(
-                  padding: EdgeInsets.only(left: 16, right: 10),
-                  margin: EdgeInsets.only(top: 10),
+                  padding: const EdgeInsets.only(left: 16, right: 10),
+                  margin: const EdgeInsets.only(top: 10),
                   height: 45,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     color: ColorConstants.grayECECEC,
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
                   ),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
@@ -321,20 +321,20 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                     "hour",
                     Utils.isNotEmpty(editIndexOption?.adjustHours) && editIndexOption?.adjustHours != "0.00" ? editIndexOption!.adjustHours! : "",
                     hintText: "Enter...".tr,
-                    hintStyle: TextStyle(
+                    hintStyle: const TextStyle(
                       color: ColorConstants.gray88,
                       fontSize: 14,
                       fontWeight: FontWeight.w400,
                     ),
                     controller: hourController,
                     focusNode: hourFocusNode,
-                    margin: EdgeInsets.only(left: 0, right: 0, top: 8),
+                    margin: const EdgeInsets.only(left: 0, right: 0, top: 8),
                     showDivider: false,
                     fillBackgroundColor: ColorConstants.grayECECEC,
                     fillCornerRadius: 5,
-                    padding: EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 0),
+                    padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 0),
                     height: 40,
-                    style: TextStyle(
+                    style: const TextStyle(
                       color: ColorConstants.black33,
                       fontSize: 14,
                       fontWeight: FontWeight.w400,
@@ -373,8 +373,8 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
           //分割线
           Container(
-            margin: EdgeInsets.only(top: 25),
-            color: Color(0XFFCECECE),
+            margin: const EdgeInsets.only(top: 25),
+            color: const Color(0XFFCECECE),
             height: 0.5,
           ),
           Row(
@@ -390,13 +390,13 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                       fontSize: 17.5,
                       isFontMedium: true,
                       textAlign: TextAlign.center,
-                      textColor: Color(0XFF0085C4),
+                      textColor: const Color(0XFF0085C4),
                       cornerRadius: 3,
                       borderWidth: 1,
                     ),
                   )),
               Container(
-                color: Color(0xff09141F).withOpacity(0.13),
+                color: const Color(0xff09141F).withOpacity(0.13),
                 width: 0.5,
               ),
               Expanded(
@@ -416,7 +416,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
                       fontSize: 17.5,
                       isFontMedium: true,
                       textAlign: TextAlign.center,
-                      textColor: Color(0XFF0085C4),
+                      textColor: const Color(0XFF0085C4),
                       cornerRadius: 3,
                     ),
                   )),
@@ -438,7 +438,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
     DatePickerUtil.showCupertinoDatePicker(
       selectedDateTime: DateTimeUtils.getDateTime(editIndexOption!.startTime ?? ""),
-      mode: CupertinoDatePickerMode.time,
+      mode: CupertinoDatePickerMode.dateAndTime,
       onDateTimeChanged: (date) {
         setState(() {
           editIndexOption?.startTime = DateTimeUtils.formatDate(date);
@@ -454,7 +454,7 @@ class _DialogAppliedModifyState extends State<DialogAppliedModify> {
 
     DatePickerUtil.showCupertinoDatePicker(
       selectedDateTime: DateTimeUtils.getDateTime(editIndexOption!.endTime ?? ""),
-      mode: CupertinoDatePickerMode.time,
+      mode: CupertinoDatePickerMode.dateAndTime,
       onDateTimeChanged: (date) {
         setState(() {
           editIndexOption?.endTime = DateTimeUtils.formatDate(date);

+ 2 - 2
packages/cpt_job_sg/lib/modules/job_applied/job_applied_controller.dart

@@ -232,8 +232,8 @@ class JobAppliedController extends GetxController with DioCancelableMixin {
 
     var result = await _jobRepository.submitEditJobApplied(
       entity.appliedId,
-      DateTimeUtils.formatDateStr(entity.startTime ?? "", format: "HH:mm:ss"),
-      DateTimeUtils.formatDateStr(entity.endTime ?? "", format: "HH:mm:ss"),
+      entity.startTime,
+      entity.endTime,
       entity.securityIn,
       entity.securityOut,
       entity.workIn,