From 2ec9a263658e436083553ea2b24abef27ee93d20 Mon Sep 17 00:00:00 2001 From: fengxiaoyu Date: Fri, 17 Feb 2023 16:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=9C=89=E4=B8=80=E4=B8=AA=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...a => EnterpriseInformationController.java} | 28 +++++------ ....java => EnterpriseInformationMapper.java} | 24 +++++----- ...mation.java => EnterpriseInformation.java} | 4 +- ...ava => IEnterpriseInformationService.java} | 22 ++++----- ... => EnterpriseInformationServiceImpl.java} | 46 +++++++++---------- ...er.xml => EnterpriseInformationMapper.xml} | 40 ++++++++-------- .../mapper/EscalateHiddenDangerMapper.xml | 2 +- .../resources/mapper/EscalateRiskMapper.xml | 2 +- .../mapper/HazardousOperationMapper.xml | 2 +- .../resources/mapper/HiddenDangerMapper.xml | 2 +- .../src/main/resources/mapper/RiskMapper.xml | 2 +- 11 files changed, 87 insertions(+), 87 deletions(-) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/{EnterpriseInfomationController.java => EnterpriseInformationController.java} (58%) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/{EnterpriseInfomationMapper.java => EnterpriseInformationMapper.java} (61%) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/{EnterpriseInfomation.java => EnterpriseInformation.java} (98%) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/{IEnterpriseInfomationService.java => IEnterpriseInformationService.java} (55%) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/{EnterpriseInfomationServiceImpl.java => EnterpriseInformationServiceImpl.java} (50%) rename hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/{EnterpriseInfomationMapper.xml => EnterpriseInformationMapper.xml} (79%) diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java similarity index 58% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java index 0bc0dde..1cdd1fa 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java @@ -3,8 +3,8 @@ package com.hbt.safety.supervision.controller; import java.util.List; import com.alibaba.fastjson.JSONObject; -import com.hbt.safety.supervision.pojo.EnterpriseInfomation; -import com.hbt.safety.supervision.service.IEnterpriseInfomationService; +import com.hbt.safety.supervision.pojo.EnterpriseInformation; +import com.hbt.safety.supervision.service.IEnterpriseInformationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,20 +20,20 @@ import com.hbt.common.core.web.page.TableDataInfo; * @author zhangyu */ @RestController -@RequestMapping("/infomation") -public class EnterpriseInfomationController extends BaseController +@RequestMapping("/information") +public class EnterpriseInformationController extends BaseController { @Autowired - private IEnterpriseInfomationService enterpriseInfomationService; + private IEnterpriseInformationService enterpriseInformationService; /** * 查询企业信息列表 */ @GetMapping("/list") - public String list(EnterpriseInfomation enterpriseInfomation) + public String list(EnterpriseInformation enterpriseInformation) { startPage(); - List list = enterpriseInfomationService.selectEnterpriseInfomationList(enterpriseInfomation); + List list = enterpriseInformationService.selectEnterpriseInformationList(enterpriseInformation); TableDataInfo tableDataInfo = getDataTable(list); return JSONObject.toJSONString(tableDataInfo); } @@ -44,7 +44,7 @@ public class EnterpriseInfomationController extends BaseController @GetMapping(value = "/getInfo") public String getInfo(int id) { - AjaxResult ajaxResult = success(enterpriseInfomationService.selectEnterpriseInfomationById(id)); + AjaxResult ajaxResult = success(enterpriseInformationService.selectEnterpriseInformationById(id)); return JSONObject.toJSONString(ajaxResult); } @@ -52,9 +52,9 @@ public class EnterpriseInfomationController extends BaseController * 新增企业信息 */ @GetMapping("/add") - public String add(@RequestBody EnterpriseInfomation enterpriseInfomation) + public String add(@RequestBody EnterpriseInformation enterpriseInformation) { - AjaxResult ajaxResult = toAjax(enterpriseInfomationService.insertEnterpriseInfomation(enterpriseInfomation)); + AjaxResult ajaxResult = toAjax(enterpriseInformationService.insertEnterpriseInformation(enterpriseInformation)); return JSONObject.toJSONString(ajaxResult); } @@ -62,9 +62,9 @@ public class EnterpriseInfomationController extends BaseController * 修改企业信息 */ @GetMapping("/edit") - public String edit(@RequestBody EnterpriseInfomation enterpriseInfomation) + public String edit(@RequestBody EnterpriseInformation enterpriseInformation) { - AjaxResult ajaxResult = toAjax(enterpriseInfomationService.updateEnterpriseInfomation(enterpriseInfomation)); + AjaxResult ajaxResult = toAjax(enterpriseInformationService.updateEnterpriseInformation(enterpriseInformation)); return JSONObject.toJSONString(ajaxResult); } @@ -74,7 +74,7 @@ public class EnterpriseInfomationController extends BaseController @GetMapping("/remove") public String remove(int[] ids) { - AjaxResult ajaxResult = toAjax(enterpriseInfomationService.deleteEnterpriseInfomationByIds(ids)); + AjaxResult ajaxResult = toAjax(enterpriseInformationService.deleteEnterpriseInformationByIds(ids)); return JSONObject.toJSONString(ajaxResult); } @@ -84,6 +84,6 @@ public class EnterpriseInfomationController extends BaseController @GetMapping("/enterpriseStatistics") public String enterpriseStatistics() { - return enterpriseInfomationService.enterpriseStatistics(); + return enterpriseInformationService.enterpriseStatistics(); } } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java similarity index 61% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java index 5b841e9..edb9937 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java @@ -3,14 +3,14 @@ package com.hbt.safety.supervision.mapper; import java.util.List; import java.util.Map; -import com.hbt.safety.supervision.pojo.EnterpriseInfomation; +import com.hbt.safety.supervision.pojo.EnterpriseInformation; /** * 企业信息Mapper接口 * * @author zhangyu */ -public interface EnterpriseInfomationMapper +public interface EnterpriseInformationMapper { /** * 查询企业信息 @@ -18,31 +18,31 @@ public interface EnterpriseInfomationMapper * @param id 企业信息主键 * @return 企业信息 */ - EnterpriseInfomation selectEnterpriseInfomationById(int id); + EnterpriseInformation selectEnterpriseInformationById(int id); /** * 查询企业信息列表 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 企业信息集合 */ - List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation); + List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); /** * 新增企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ - int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation); + int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation); /** * 修改企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ - int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation); + int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation); /** * 删除企业信息 @@ -50,7 +50,7 @@ public interface EnterpriseInfomationMapper * @param id 企业信息主键 * @return 结果 */ - int deleteEnterpriseInfomationById(int id); + int deleteEnterpriseInformationById(int id); /** * 批量删除企业信息 @@ -58,14 +58,14 @@ public interface EnterpriseInfomationMapper * @param ids 需要删除的数据主键集合 * @return 结果 */ - int deleteEnterpriseInfomationByIds(int[] ids); + int deleteEnterpriseInformationByIds(int[] ids); /** * 查询企业信息列表 * * @return 企业信息集合 */ - List selectEnterpriseInfomations(); + List selectEnterpriseInformations(); /** * 在管企业分类统计 diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInfomation.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java similarity index 98% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInfomation.java rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java index 98e7ec6..6e9c021 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInfomation.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java @@ -6,12 +6,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** - * 企业信息对象 enterprise_infomation + * 企业信息对象 enterprise_information * * @author zhangyu * @date 2023-02-14 */ -public class EnterpriseInfomation extends BaseEntity +public class EnterpriseInformation extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInfomationService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java similarity index 55% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInfomationService.java rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java index 9c9c42b..e442cc1 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInfomationService.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java @@ -2,7 +2,7 @@ package com.hbt.safety.supervision.service; import java.util.List; -import com.hbt.safety.supervision.pojo.EnterpriseInfomation; +import com.hbt.safety.supervision.pojo.EnterpriseInformation; /** * 企业信息Service接口 @@ -10,7 +10,7 @@ import com.hbt.safety.supervision.pojo.EnterpriseInfomation; * @author zhangyu * @date 2023-02-14 */ -public interface IEnterpriseInfomationService +public interface IEnterpriseInformationService { /** * 查询企业信息 @@ -18,31 +18,31 @@ public interface IEnterpriseInfomationService * @param id 企业信息主键 * @return 企业信息 */ - EnterpriseInfomation selectEnterpriseInfomationById(int id); + EnterpriseInformation selectEnterpriseInformationById(int id); /** * 查询企业信息列表 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 企业信息集合 */ - List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation); + List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation); /** * 新增企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ - int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation); + int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation); /** * 修改企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ - int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation); + int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation); /** * 批量删除企业信息 @@ -50,7 +50,7 @@ public interface IEnterpriseInfomationService * @param ids 需要删除的企业信息主键集合 * @return 结果 */ - int deleteEnterpriseInfomationByIds(int[] ids); + int deleteEnterpriseInformationByIds(int[] ids); /** * 删除企业信息信息 @@ -58,7 +58,7 @@ public interface IEnterpriseInfomationService * @param id 企业信息主键 * @return 结果 */ - int deleteEnterpriseInfomationById(int id); + int deleteEnterpriseInformationById(int id); /** * 在管企业分类统计 diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java similarity index 50% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java index dfcf3e2..82a7ea2 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import com.alibaba.fastjson.JSONObject; -import com.hbt.safety.supervision.mapper.EnterpriseInfomationMapper; -import com.hbt.safety.supervision.pojo.EnterpriseInfomation; -import com.hbt.safety.supervision.service.IEnterpriseInfomationService; +import com.hbt.safety.supervision.mapper.EnterpriseInformationMapper; +import com.hbt.safety.supervision.pojo.EnterpriseInformation; +import com.hbt.safety.supervision.service.IEnterpriseInformationService; import com.hbt.safety.supervision.mapper.PersonMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,9 +19,9 @@ import org.springframework.stereotype.Service; * @date 2023-02-14 */ @Service -public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationService { +public class EnterpriseInformationServiceImpl implements IEnterpriseInformationService { @Autowired - private EnterpriseInfomationMapper enterpriseInfomationMapper; + private EnterpriseInformationMapper enterpriseInformationMapper; @Autowired PersonMapper personMapper; @@ -33,41 +33,41 @@ public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationSer * @return 企业信息 */ @Override - public EnterpriseInfomation selectEnterpriseInfomationById(int id) { - return enterpriseInfomationMapper.selectEnterpriseInfomationById(id); + public EnterpriseInformation selectEnterpriseInformationById(int id) { + return enterpriseInformationMapper.selectEnterpriseInformationById(id); } /** * 查询企业信息列表 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 企业信息 */ @Override - public List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation) { - return enterpriseInfomationMapper.selectEnterpriseInfomationList(enterpriseInfomation); + public List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation) { + return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); } /** * 新增企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ @Override - public int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation) { - return enterpriseInfomationMapper.insertEnterpriseInfomation(enterpriseInfomation); + public int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation) { + return enterpriseInformationMapper.insertEnterpriseInformation(enterpriseInformation); } /** * 修改企业信息 * - * @param enterpriseInfomation 企业信息 + * @param enterpriseInformation 企业信息 * @return 结果 */ @Override - public int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation) { - return enterpriseInfomationMapper.updateEnterpriseInfomation(enterpriseInfomation); + public int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation) { + return enterpriseInformationMapper.updateEnterpriseInformation(enterpriseInformation); } /** @@ -77,8 +77,8 @@ public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationSer * @return 结果 */ @Override - public int deleteEnterpriseInfomationByIds(int[] ids) { - return enterpriseInfomationMapper.deleteEnterpriseInfomationByIds(ids); + public int deleteEnterpriseInformationByIds(int[] ids) { + return enterpriseInformationMapper.deleteEnterpriseInformationByIds(ids); } /** @@ -88,8 +88,8 @@ public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationSer * @return 结果 */ @Override - public int deleteEnterpriseInfomationById(int id) { - return enterpriseInfomationMapper.deleteEnterpriseInfomationById(id); + public int deleteEnterpriseInformationById(int id) { + return enterpriseInformationMapper.deleteEnterpriseInformationById(id); } /** @@ -101,14 +101,14 @@ public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationSer public String enterpriseStatistics() { Map map = new HashMap<>(); // 企业分类及数量 - List> list = enterpriseInfomationMapper.enterpriseStatistics(); + List> list = enterpriseInformationMapper.enterpriseStatistics(); // 在管企业数量 - int enterpriseCount = enterpriseInfomationMapper.getEnterpriseCount(); + int enterpriseCount = enterpriseInformationMapper.getEnterpriseCount(); // 企业员工数 int personCount = personMapper.getPersonCount(); // 等级车辆数 - int carCount = enterpriseInfomationMapper.getCarCount(); + int carCount = enterpriseInformationMapper.getCarCount(); map.put("enterpriseClassification", list); map.put("enterpriseCount", enterpriseCount); map.put("personCount", personCount); diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInfomationMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInformationMapper.xml similarity index 79% rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInfomationMapper.xml rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInformationMapper.xml index af00583..6de352b 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInfomationMapper.xml +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,24 +20,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, unify_social_credit_code, name, registration_number, legal_representative, type, establishment_date, fund_amount, approval_date, registration_authority, registration_status, dwelling_place, business_scope from enterprise_infomation + + select id, unify_social_credit_code, name, registration_number, legal_representative, type, establishment_date, fund_amount, approval_date, registration_authority, registration_status, dwelling_place, business_scope from enterprise_information - + and id = #{id} - + where id = #{id} - - insert into enterprise_infomation + + insert into enterprise_information id, unify_social_credit_code, @@ -70,8 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update enterprise_infomation + + update enterprise_information unify_social_credit_code = #{unifySocialCreditCode}, name = #{name}, @@ -89,27 +89,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from enterprise_infomation where id = #{id} + + delete from enterprise_information where id = #{id} - - delete from enterprise_infomation where id in + + delete from enterprise_information where id in #{id} - + select from enterprise_information diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml index 58781dd..d00de71 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct(h.id) id, h.name name, e.name enterprise from escalate_risk as a left join risk as h on a.risk_id = h.id - left join enterprise_infomation as e on h.enterprise_id = e.id + left join enterprise_information as e on h.enterprise_id = e.id diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml index 90b3f99..0abdd16 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.name as person, r.name as riskName from hidden_danger as a - left join enterprise_infomation as b on a.enterprise_id = b.id + left join enterprise_information as b on a.enterprise_id = b.id left join person as p on a.person_id = p.id left join risk as r on a.risk_id = r.id diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml index 0df3ccf..7f39356 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.name as enterprise, p.name as responsiblePerson from risk as a - left join enterprise_infomation as b on a.enterprise_id = b.id + left join enterprise_information as b on a.enterprise_id = b.id left join person as p on a.responsible_person_id = p.id