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..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 lawCasedetail(AppLawEnforcementCaseBo bo) { + return R.ok(appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo)); } /** @@ -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 lawDetail(AppLawEnforcementCaseBo bo) { + AppEnforcementRegistrationVo result = appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); + return R.ok("获取成功", result); } } 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> entry : groupedByNo.entrySet()) { Map map = new HashMap<>(); for (EnforcementRegistration e : entry.getValue()) { - map.put(e.getId(), e); + map.put(null, e); } result.add(map); } 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 @@
创建新的联合执法 + + +
+ +
暂无联合执法数据
+
+
+
{{ item.bureauDeptName || '联合执法' }}
+
{{ item.deptTexts || item.lawText || '' }}
+
+
+