diff --git a/client/src/api/lawenforcement/Enterprise.js b/client/src/api/lawenforcement/Enterprise.js index e68b480..630db6b 100644 --- a/client/src/api/lawenforcement/Enterprise.js +++ b/client/src/api/lawenforcement/Enterprise.js @@ -15,7 +15,6 @@ export const enterprises = { method: REQUEST_METHOD_TYPES.GET, params: query }), - ledgerStatistics(query) {//企业信息统计 return api({ url: url + '/ledgerStatistics', diff --git a/client/src/router/index.js b/client/src/router/index.js index a52f723..83de511 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -107,7 +107,6 @@ const baseRoutes = [ }, { path: 'qyfjfl', - name: '_qyfjfl', component: () => import('@views/dtsjygl/qyfjfl.vue'), meta: { title: '企业分级分类', diff --git a/client/src/views/dtsjygl/qyfjfl.vue b/client/src/views/dtsjygl/qyfjfl.vue index 8036710..068cfe7 100644 --- a/client/src/views/dtsjygl/qyfjfl.vue +++ b/client/src/views/dtsjygl/qyfjfl.vue @@ -328,14 +328,14 @@ function handleCityChange() { const broTable = ref(null) function handleExport() { - broTable.value.busiTable.exportExcelFileForAllData('/api/lawenforcement/enterprises/export', '企业分级分类信息', Object.assign({}, queryParams.value, {tag: 'fjfl'})) + broTable.value.busiTable.exportExcelFileForAllData('/api/lawenforcement/enterprises/export', '分级分类信息', Object.assign({}, queryParams.value, {tag: 'fjfl'})) } function handleTune(row) { dialogConfig.value.show = true dialogConfig.value.mode = 'tune' dialogConfig.value.type = 'max' - dialogConfig.value.title = '调整企业分级分类' + dialogConfig.value.title = '企业分级分类' dialogConfig.value.loading = true apiConfig.value.api.findOne(row[apiConfig.value.modelId]).then(res => { if (res.success) { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/InsEnterprse.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/InsEnterprse.java index 0546e97..dd56ffc 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/InsEnterprse.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/InsEnterprse.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; import java.util.Objects; /** - * 企业信息实体类 + * 在线巡查企业信息实体类 */ @Entity @Table(name = "zf_ins_enterprise") diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java index feab876..111fd71 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java @@ -175,6 +175,7 @@ public class EnterpriseJoinScheduleService { do { // 查询企业信息 pageResult = pageEnterprise(page, limit); + List enterprises = pageResult.getContent(); if (!enterprises.isEmpty()) { // 更新企业自查自报信息 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java index bcc05eb..fb8cc76 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java @@ -53,7 +53,7 @@ public class EnterpriseScheduleService { private final String produceLicensePage; private final String hazardPage; private final String sourcesDangerPage; - private final DictInterfaceService dictService;、 + private final DictInterfaceService dictService; private final DateTimeFormatter yyyy = DateTimeFormatter.ofPattern("yyyy"); public EnterpriseScheduleService(EnterpriseRepository enterpriseRepo,