From 60a729019e45ebaa28440440f0a3b8a83c4e26a0 Mon Sep 17 00:00:00 2001
From: ganhao <ganhao@pdsk999.onexmail.com>
Date: Fri, 26 Jun 2026 15:05:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=89=A7=E6=B3=95=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/enterprise/AppEntLawEnforcementCaseController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
index f7b70e1f..5f702b25 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
@@ -60,9 +60,9 @@ public class AppEntLawEnforcementCaseController extends BaseController {
      */
     @ApiResponse(description = "企业端-执法信息详情")
     @GetMapping("/lawDetail")
-    public AppEnforcementRegistrationVo lawDetail(AppLawEnforcementCaseBo bo) {
-        return null;
-//        return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo);
+    public R<AppEnforcementRegistrationVo> lawDetail(AppLawEnforcementCaseBo bo) {
+        AppEnforcementRegistrationVo result = appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo);
+        return R.ok("获取成功", result);
     }
 
 }

From 649ba3b3dd482afa8c347464db8aed8c0a418afc Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 26 Jun 2026 15:16:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E6=A1=88?=
 =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/enterprise/AppEntLawEnforcementCaseController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
index 5f702b25..762de972 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java
@@ -49,8 +49,8 @@ public class AppEntLawEnforcementCaseController extends BaseController {
      */
     @ApiResponse(description = "企业端-执法案件信息详情")
     @GetMapping("/lawCasedetail")
-    public AppLawEnforcementCaseVo lawCasedetail(AppLawEnforcementCaseBo bo) {
-        return appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo);
+    public R<AppLawEnforcementCaseVo> lawCasedetail(AppLawEnforcementCaseBo bo) {
+        return R.ok(appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo));
     }
 
     /**

From 028cd0ee006ac76265144f4a86f59dfbe1b28976 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 26 Jun 2026 16:14:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E6=89=A7=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnforcementRegistrationServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
index cba310b8..6e3b78d0 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
@@ -1057,7 +1057,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         for (Map.Entry<String, List<EnforcementRegistration>> entry : groupedByNo.entrySet()) {
             Map<String, Object> map = new HashMap<>();
             for (EnforcementRegistration e : entry.getValue()) {
-                map.put(e.getId(), e);
+                map.put(null, e);
             }
             result.add(map);
         }

From af949eed25f018c060c4d549eccd9393976ddbc7 Mon Sep 17 00:00:00 2001
From: wangmingyong <wangmingyong@163.com>
Date: Fri, 26 Jun 2026 16:20:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=20=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=A1=A5=E5=BD=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/enforcement/index.js              |   2 +
 .../register/EnforcementInfoSection.vue       | 109 +++++++++++++++++-
 .../enforce/enforcementRegister.vue           |  17 ++-
 .../enforcement/home/enforcementHome.vue      |   2 +-
 4 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
index d8a033e9..74826559 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
@@ -52,6 +52,8 @@ export const queryAccordingList = (params, success, error) => _get(baseUrl + "/a
 
 export const queryEnfRegistrationList = (params, success, error) => _get(baseUrl + "/enfRegistration/queryList", params, success, error);
 
+export const queryUnionByHour = (params, success, error) => _get(baseUrl + "/enfRegistration/queryUnionByHour", params, success, error);
+
 // 行政执法保存
 export const saveEnfRegistration = (params, success, error) => _post(baseUrl + "/enfRegistration/add", params, success, error);
 
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
index e591d895..ed40fde4 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue
@@ -88,6 +88,24 @@
         <!-- 联合执法选择"是"时显示的内容 -->
         <div v-if="formData.jointEnforcement === '1'" class="joint-enforcement-options">
             <van-checkbox v-model="formData.isNewJoint">创建新的联合执法</van-checkbox>
+            
+            <!-- 联合执法列表（未选择创建新的联合执法时显示） -->
+            <div v-if="!formData.isNewJoint" class="union-list-container">
+                <van-loading v-if="unionLoading" size="20" />
+                <div v-else-if="unionList.length === 0" class="empty-tip">暂无联合执法数据</div>
+                <div v-else class="union-list">
+                    <div
+                        v-for="item in unionList"
+                        :key="item.id"
+                        class="union-item"
+                        :class="{ active: formData.uniteCheck === item.id }"
+                        @click="selectUnion(item)"
+                    >
+                        <div class="union-item-title">{{ item.bureauDeptName || '联合执法' }}</div>
+                        <div class="union-item-desc">{{ item.deptTexts || item.lawText || '' }}</div>
+                    </div>
+                </div>
+            </div>
         </div>
         <!-- 隐藏字段用于验证联合执法 -->
         <van-field v-model="jointEnforcementValue" name="jointEnforcement"
@@ -128,13 +146,15 @@
 </template>
 
 <script setup name="EnforcementInfoSection">
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, watch } from 'vue';
+import { showToast } from 'vant';
 import { uploadFile } from '@/util/fileUpload';
 import {
     getEnforcementTimeDateRange,
     parseEnforcementTimeToPicker,
     buildEnforcementTimeFromPicker,
 } from '@/util/enforcementTimePicker';
+import { queryUnionByHour } from '@/api/enforcement';
 
 const props = defineProps({
     formData: {
@@ -148,6 +168,10 @@ const props = defineProps({
     additionalPersons: {
         type: Array,
         default: () => []
+    },
+    enterpriseNumber: {
+        type: String,
+        default: ''
     }
 });
 
@@ -170,6 +194,9 @@ const minDate = ref(new Date());
 const maxDate = ref(new Date());
 let defaultPickerValue = [];
 
+const unionList = ref([]);
+const unionLoading = ref(false);
+
 onMounted(() => {
     const range = getEnforcementTimeDateRange(10);
     minDate.value = range.minDate;
@@ -178,6 +205,37 @@ onMounted(() => {
     datePickerValue.value = [...range.currentDate];
 });
 
+watch(() => props.formData.jointEnforcement, (newVal) => {
+    if (newVal === '1') {
+        if (!props.enterpriseNumber) {
+            showToast('请先选择企业');
+            props.formData.jointEnforcement = '0';
+            return;
+        }
+        fetchUnionList();
+    } else {
+        unionList.value = [];
+    }
+});
+
+const fetchUnionList = () => {
+    unionLoading.value = true;
+    queryUnionByHour({ enterpriseNumber: props.enterpriseNumber }, (res) => {
+        unionLoading.value = false;
+        if (res && res.data) {
+            unionList.value = res.data;
+        }
+    }, (err) => {
+        unionLoading.value = false;
+        console.error('获取联合执法列表失败:', err);
+    });
+};
+
+const selectUnion = (item) => {
+    props.formData.unionNo = item.unionNo || '';
+    props.formData.uniteCheck = item.id || '';
+};
+
 const openTimePicker = () => {
     const parsed = parseEnforcementTimeToPicker(props.formData.enforcementTime);
     datePickerValue.value = parsed ? [...parsed] : [...defaultPickerValue];
@@ -385,6 +443,55 @@ const onAfterReadImage = (file) => {
     .joint-enforcement-options {
         padding: 0.32rem;
         padding-bottom: 30px;
+
+        .union-list-container {
+            margin-top: 0.24rem;
+            padding: 0.24rem;
+            background: #f5f7fa;
+            border-radius: 0.1rem;
+
+            .empty-tip {
+                text-align: center;
+                color: #999;
+                font-size: 14px;
+                padding: 0.4rem;
+            }
+        }
+
+        .union-list {
+            display: flex;
+            flex-direction: column;
+            gap: 0.16rem;
+        }
+
+        .union-item {
+            padding: 0.2rem;
+            background: #fff;
+            border-radius: 0.08rem;
+            border: 1px solid #e8e8e8;
+            transition: all 0.2s;
+
+            &:active {
+                transform: scale(0.98);
+            }
+
+            &.active {
+                border-color: #1367fe;
+                background: rgba(19, 103, 254, 0.05);
+            }
+
+            .union-item-title {
+                font-size: 14px;
+                color: #333;
+                font-weight: 500;
+            }
+
+            .union-item-desc {
+                font-size: 12px;
+                color: #999;
+                margin-top: 0.08rem;
+            }
+        }
     }
 
     :deep(.van-field__value) {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
index 1ac2e67e..e2d59db1 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
@@ -15,6 +15,7 @@
             <!-- 执法信息组件（行政执法模式） -->
             <EnforcementInfoSection v-if="!isNonEnforcement" :form-data="formData"
                 :default-person="enforcementPersons[0]" :additional-persons="additionalPersons"
+                :enterprise-number="enterpriseData.enterpriseNumber"
                 @show-notice-picker="showPopups.notice = true" @open-person-picker="handleOpenPersonPicker"
                 @remove-person="handleRemovePerson" @show-category-picker="showPopups.category = true"
                 @show-task-source-picker="showPopups.taskSource = true" @open-basis-picker="handleOpenBasisPicker"
@@ -88,6 +89,7 @@ const formData = reactive({
     reason: '系统未能有效生成监管码',
     enforcementTime: '',
     jointEnforcement: '0',
+    isNewJoint: false,
     entrustedEnforcement: '0',
     entrustedAgency: '',
     entrustedAgencyId: '',
@@ -316,6 +318,17 @@ const buildSubmitPayload = () => {
     // 执法依据ID列表
     const lawEnforcementBasis = formData.enforcementBasesIds ? formData.enforcementBasesIds.join(',') : '';
 
+const getCurrentDateTime = () => {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const day = String(now.getDate()).padStart(2, '0');
+    const hour = String(now.getHours()).padStart(2, '0');
+    const minute = String(now.getMinutes()).padStart(2, '0');
+    const second = String(now.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+};
+
     // 非行政执法payload
     if (isNonEnforcement.value) {
         // 通过字典接口查询入企事由对应的数字值
@@ -327,7 +340,7 @@ const buildSubmitPayload = () => {
             enterpriseName: enterpriseData.value.enterpriseName || '',
             enterpriseNumber: enterpriseData.value.enterpriseNumber || '',
             enterpriseAddress: enterpriseData.value.enterpriseAddress || '',
-            enforcementTime: formData.enforcementTime || '',
+            enforcementTime: formData.enforcementTime || getCurrentDateTime(),
             lawEnforcer: lawEnforcer,
             lawEnforcerId: lawEnforcerId,
             lawEnforcerTel: lawEnforcerTel,
@@ -374,7 +387,7 @@ const buildSubmitPayload = () => {
         enterpriseName: enterpriseData.value.enterpriseName || '',
         enterpriseNumber: enterpriseData.value.enterpriseNumber || '',
         enterpriseAddress: enterpriseData.value.enterpriseAddress || '',
-        enforcementTime: formData.enforcementTime || '',
+        enforcementTime: formData.enforcementTime || getCurrentDateTime(),
         updateTimeFlag: 0,
         fileList: buildFileList(),
         fileListObj: formData.fileListObj || [],
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
index 10e977c9..42ad4a9e 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
@@ -13,7 +13,7 @@
             <div class="notice-bar">
                 <img src="@/assets/images/icon_notice.png" class="notice-icon" alt="" />
                 <van-notice-bar v-if="noticeList.length > 0" class="notice-scroll"
-                    :scrollable="noticeList.length > 1 || (noticeList[0]?.title || '').length > 16"
+                    :scrollable="noticeList.length > 0 || (noticeList[0]?.title || '').length > 16"
                     background="transparent" color="#8c8c8c" :text="noticeText" />
                 <span v-else class="notice-text">暂无新通知</span>
             </div>