From b3dceff20bdaddf95df08c326ca00a3fe0708af9 Mon Sep 17 00:00:00 2001 From: zhangchaoyang02 Date: Fri, 15 Aug 2025 19:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8F=AF=E8=A7=86=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/dtsjygl/dtsjk.vue | 8 +------- client/src/views/dtsjygl/qyxxcx.vue | 1 - .../service/EnterpriseAuditService.java | 11 +---------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/client/src/views/dtsjygl/dtsjk.vue b/client/src/views/dtsjygl/dtsjk.vue index ebd4495..09f776d 100644 --- a/client/src/views/dtsjygl/dtsjk.vue +++ b/client/src/views/dtsjygl/dtsjk.vue @@ -112,13 +112,7 @@ const state = reactive({ rules: { industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }], unitName: [{ required: 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' }], + uired: 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 8abad08..8dda0cb 100644 --- a/client/src/views/dtsjygl/qyxxcx.vue +++ b/client/src/views/dtsjygl/qyxxcx.vue @@ -355,7 +355,6 @@ async function handleDetail(row) { dialogConfig.value.show = true dialogConfig.value.mode = 'detail' dialogConfig.value.title = '详情企业信息' - findOne(row) } 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 05d4c60..2678f0a 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,16 +80,7 @@ public class EnterpriseAuditService { String legalPhone = enterpriseAudit.getLegalPhone(); if (enterpriseAuditRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId) || enterpriseRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0)) - 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"); + storySide("2"); enterpriseHistoryRepo.save(history); //测试使用 // enterpriseRepo.findById(audit.getEnterpriseId()).ifPresent(enterprise -> uploadEnterprise(enterprise, user));