From 0bbffc9772d0dae2520f99f5ae0de7018af0ddd5 Mon Sep 17 00:00:00 2001 From: yuyan02 Date: Fri, 15 Aug 2025 19:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=BB=9F=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E5=8F=96=E8=AF=81=E7=AD=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/big-screen/bigdata.vue | 4 +++- client/src/views/dtsjygl/dtsjk.vue | 8 +++++++- client/src/views/dtsjygl/qyxxcx.vue | 1 + .../service/EnterpriseAuditService.java | 11 ++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index 9ded393..ace0890 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -118,7 +118,9 @@
对讲机
{{ zfdjjzs }}
- +
+
问询室
+
0
diff --git a/client/src/views/dtsjygl/dtsjk.vue b/client/src/views/dtsjygl/dtsjk.vue index 09f776d..ebd4495 100644 --- a/client/src/views/dtsjygl/dtsjk.vue +++ b/client/src/views/dtsjygl/dtsjk.vue @@ -112,7 +112,13 @@ const state = reactive({ rules: { industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }], unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }], - uired: true, message: '属地不能为空', trigger: 'blur' }], + shortName: [{ required: true, message: '单位简称不能为空', trigger: 'blur' }], + unifiedSocialCode: [{ required: true, message: '社会统一信用代码不能为空', trigger: 'blur' }], + businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }], + orgCode: [{ required: false, message: '所属机构不能为空', trigger: 'blur' }], + legalRepresentative: [{ required: true, message: '法定代表人（经营者）姓名不能为空', trigger: 'blur' }], + contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }], + agency: [{ required: true, message: '属地不能为空', trigger: 'blur' }], legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }], legalDuty: [{ required: true, message: '法定代表人（经营者）职位不能为空', trigger: 'blur' }], regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }], diff --git a/client/src/views/dtsjygl/qyxxcx.vue b/client/src/views/dtsjygl/qyxxcx.vue index 8dda0cb..4918540 100644 --- a/client/src/views/dtsjygl/qyxxcx.vue +++ b/client/src/views/dtsjygl/qyxxcx.vue @@ -355,6 +355,7 @@ async function handleDetail(row) { dialogConfig.value.show = true dialogConfig.value.mode = 'detail' dialogConfig.value.title = '详情企业信息' + } async function handleModify(row) { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java index 2678f0a..05d4c60 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java @@ -80,7 +80,16 @@ public class EnterpriseAuditService { String legalPhone = enterpriseAudit.getLegalPhone(); if (enterpriseAuditRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId) || enterpriseRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0)) - storySide("2"); + throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); + EnterpriseHistory history = new EnterpriseHistory(); + BeanUtils.copyProperties(audit, history); + history.setTheType("普通修改"); + if (null != user) { + history.setHistoryTime(now); + history.setTheUserName(user.getXm()); + history.setTheUserName(user.getYhwybs()); + } + history.setHistorySide("2"); enterpriseHistoryRepo.save(history); //测试使用 // enterpriseRepo.findById(audit.getEnterpriseId()).ifPresent(enterprise -> uploadEnterprise(enterprise, user));