2026.6.22 重点作业处罚模块

lib/pages/home/keyTasks/keyTasksDetail/keyTasksHiddenDanger/key_tasks_hidden_danger_detail.dart

@@ -46,6 +46,7 @@ class KeyTasksHiddenDangerDetail extends StatefulWidget {
     Key? key,
     this.inspectId,
     this.inspectCodeId,
+    this.itemData,
       }) : super(key: key);
 
   final item; // 1 隐患整改 2 隐患记录 3 处罚反馈
@@ -55,6 +56,7 @@ class KeyTasksHiddenDangerDetail extends StatefulWidget {
   final bool canChange;
   final String? inspectId;
   final String? inspectCodeId;
+  final Map<String, dynamic>? itemData; // 整个item
 
   @override
   _KeyTasksHiddenDangerDetailState createState() => _KeyTasksHiddenDangerDetailState();
@@ -134,7 +136,7 @@ class _KeyTasksHiddenDangerDetailState extends State<KeyTasksHiddenDangerDetail>
           break;
       }
 
-
+    penaltyFeedbackData['feedbackTime']= DateFormat('yyyy-MM-dd HH:mm:ss').format(DateTime.now());
     _getUserData();
     getData();
   }
@@ -614,6 +616,72 @@ class _KeyTasksHiddenDangerDetailState extends State<KeyTasksHiddenDangerDetail>
                     ),
                   ],
 
+                  // 处罚信息
+                  if (pd['hiddenPenaltyCO'] != null) ...[
+                    SizedBox(height: 10),
+                    // const Divider(height: 10,color: Colors.grey,),
+                    Card(
+                      color: Colors.white,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Padding(
+                            padding: EdgeInsets.only(
+                              top: 10,
+                              left: 10,
+                              right: 10,
+                            ),
+                            child: Row(
+                              children: [
+                                Container(
+                                  width: 3,
+                                  height: 15,
+                                  color: Colors.blue,
+                                ),
+                                const SizedBox(width: 8),
+                                Text(
+                                  "处罚信息",
+                                  style: const TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+
+                          _buildInfoItem(
+                            '是否进行处罚',
+                            pd["hiddenPenaltyCO"]['fineFlag'] ==1?'是':'否',
+                          ),
+                          Divider(height: 1),
+                          _buildInfoItem(
+                            '下发人',
+                            pd["hiddenPenaltyCO"]['penalizedUserName'] ?? '',
+                          ),
+                          Divider(height: 1),
+                          _buildInfoItem(
+                            '下发时间',
+                            _changeTime( pd["hiddenPenaltyCO"]['penaltyTime'] ?? ''),
+                            // pd["rectificationRecord"]['rectificationTime'] ?? '',
+                          ),
+                          Divider(height: 1),
+                          _buildInfoItem(
+                            '处罚原因',
+                            pd["hiddenPenaltyCO"]['penaltyDesc'] ?? '',
+                            // pd["rectificationRecord"]['rectificationTime'] ?? '',
+                          ),
+                          Divider(height: 1),
+                          _buildInfoItem(
+                              '处罚金额',
+                              pd["hiddenPenaltyCO"]['penaltyAmount']?.toString() ?? ''
+                            // pd["rectificationRecord"]['rectificationTime'] ?? '',
+                          ),
+
+                        ],
+                      ),
+                    ),
+                  ],
 
                   // // 整改信息
                   // if (pd['hiddenRectifyUserCO'] != null &&
@@ -821,7 +889,11 @@ class _KeyTasksHiddenDangerDetailState extends State<KeyTasksHiddenDangerDetail>
                           ),
 
                           Divider(height: 1),
-                          _buildInfoItem('处罚反馈人', widget.foreignKey ,),
+                          Padding(
+                              padding: EdgeInsets.symmetric(horizontal: 8),
+                              child:  _buildInfoItem('处罚反馈人', widget.itemData?['feedbackUserName']??'',),
+                          ),
+
 
                           const Divider(height: 1),
                           GestureDetector(
@@ -843,7 +915,7 @@ class _KeyTasksHiddenDangerDetailState extends State<KeyTasksHiddenDangerDetail>
                               child: ListItemFactory.createRowSpaceBetweenItem(
                                 isRequired:true,
                                 leftText: "处罚反馈时间",
-                                rightText: penaltyFeedbackData['feedbackTime'].isNotEmpty?hiddenDangerRectification['feedbackTime']:"请选择",
+                                rightText: penaltyFeedbackData['feedbackTime']??"请选择",
                                 isRight: true,
                               ),
                             ),
@@ -1121,8 +1193,9 @@ class _KeyTasksHiddenDangerDetailState extends State<KeyTasksHiddenDangerDetail>
         return;
       }
 
-      penaltyFeedbackData['hiddenPenaltyId']=widget.itemId;
+      penaltyFeedbackData['hiddenPenaltyId']=widget.itemData?['hiddenPenaltyId'];
-      penaltyFeedbackData['feedbackUserId']=widget.hiddenId;
+      penaltyFeedbackData['feedbackUserId']=widget.itemData?['feedbackUserId'];
+
 
       LoadingDialogHelper.show();
       if (gaiHouImages.isNotEmpty) {

lib/pages/home/keyTasks/keyTasksDetail/punishmentKeyTasks/key_tasks_punishment_list.dart

@@ -234,7 +234,7 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                   // 隐患状态
                   Expanded(
                     child: Text(
-                      '被处罚单位: ${pageData['']??''}',
+                      '被处罚单位: ${pageData['xgfCorpinfoName']??''}',
                       style: TextStyle(fontSize: 14, color: Colors.black87),
                     ),
                   ),
@@ -253,7 +253,7 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                   // 隐患发现人 - 使用 Expanded 包裹
                   Expanded(
                     child: Text(
-                      '被处罚人:${pageData['findUserName'] ?? ''}',
+                      '被处罚人:${pageData['feedbackUserName'] ?? ''}',
                       style: TextStyle(fontSize: 14, color: Colors.black87),
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
@@ -282,7 +282,7 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                   // 整改人
                   Expanded(
                     child:
-                    Text('处罚原因: ${pageData['projectName'] ?? ''}',
+                    Text('处罚原因: ${pageData['penaltyDesc'] ?? ''}',
                       style: TextStyle(fontSize: 14, color: Colors.black87),
                     ),
                   ),
@@ -299,7 +299,7 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                   // 整改人
                   Expanded(
                     child:
-                    Text('下发人: ${pageData['projectName'] ?? ''}',
+                    Text('下发人: ${pageData['findUserName'] ?? ''}',
                       style: TextStyle(fontSize: 14, color: Colors.black87),
                     ),
                   ),
@@ -316,7 +316,7 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                   // 整改人
                   Expanded(
                     child:
-                    Text('处罚反馈状态: ${pageData['projectName'] ?? ''}',
+                    Text('处罚反馈状态: ${pageData['feedbackStatus'] ?? ''}',
                       style: TextStyle(fontSize: 14, color: Colors.black87),
                     ),
                   ),
@@ -368,9 +368,9 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                           await pushPage(
                              KeyTasksHiddenDangerDetail(
                               2,
-                              pageData['id'],
+                               pageData['hiddenTableId']??'',
-                              pageData['hiddenId'],
+                               pageData['hiddenId']??'',
-                              pageData['foreignKey'],
+                               pageData['foreignKey']??'',
                               false,
                             ),
                             context,
@@ -394,9 +394,10 @@ class _KeyTasksPunishmentListState extends State<KeyTasksPunishmentList> {
                       await  pushPage(
                         KeyTasksHiddenDangerDetail(
                           3,
-                          pageData['hiddenPenaltyId']??'',
+                          pageData['hiddenTableId']??'',
-                          pageData['feedbackUserId']??'',
+                          pageData['hiddenId']??'',
-                          pageData['feedbackUserName']??'',
+                          pageData['foreignKey']??'',
+                          itemData:pageData,
                           false,
                         ),
                         context,