From f25ae4df68c2a58e0528fd9b0ae8862d9c8c05a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= Date: Tue, 1 Nov 2022 17:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=9C=B0=E5=8C=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/bean/SysEnterpriseDo.java | 11 ++++ .../java/com/rzyc/mapper/SysOrgMapper.java | 2 - .../rzyc/mapper/ent/SysEnterpriseMapper.java | 2 - .../com/rzyc/model/ent/SysEnterprise.java | 24 +++++++ .../main/resources/mapper/SysOrgMapper.xml | 13 +--- .../mapper/ent/SysEnterpriseMapper.xml | 64 ++----------------- .../com/rzyc/controller/BaseController.java | 2 +- .../rzyc/controller/SettingController.java | 37 +++++++---- .../controller/ent/PcCompanyController.java | 35 +++++++--- 9 files changed, 93 insertions(+), 97 deletions(-) diff --git a/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java b/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java index ddf00ad..07e7853 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java @@ -25,6 +25,9 @@ public class SysEnterpriseDo { @ApiModelProperty("组/网格id") private String netCode; + @ApiModelProperty("地区id") + private String areaCode; + @ApiModelProperty("安全类别") private String baseinclassid; @@ -85,6 +88,14 @@ public class SysEnterpriseDo { @ApiModelProperty("企业简介") private String comments; + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + public String getComments() { return comments; } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java index 252689c..7b9f4ee 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java @@ -20,8 +20,6 @@ public interface SysOrgMapper extends BaseMapper { int deleteByPrimaryKey(String orgcode); - int insert(SysOrg record); - int insertSelective(SysOrg record); List selectByExample(SysOrgExample example); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java index f3554a3..9659745 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java @@ -34,8 +34,6 @@ public interface SysEnterpriseMapper extends BaseMapper { int deleteByPrimaryKey(String sysenterpriseid); - int insert(SysEnterprise record); - int insertSelective(SysEnterprise record); diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterprise.java b/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterprise.java index 48007b9..5301956 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterprise.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterprise.java @@ -380,6 +380,30 @@ public class SysEnterprise implements Serializable { private static final long serialVersionUID = 1L; + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaPath() { + return areaPath; + } + + public void setAreaPath(String areaPath) { + this.areaPath = areaPath; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + public Integer getCheckCount() { return checkCount; } diff --git a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml b/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml index abe1ea5..e9f6da8 100644 --- a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml +++ b/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml @@ -113,16 +113,6 @@ - - insert into SysOrg (OrgCode, OrgName, OrgLevel,charger, - SuperiorOrgCode, CreatedBy, CreatedOn, - ModifiedBy, ModifiedOn) - values (#{orgcode,jdbcType=VARCHAR}, #{orgname,jdbcType=VARCHAR}, - #{orglevel,jdbcType=INTEGER}, - #{charger,jdbcType=VARCHAR}, - #{superiororgcode,jdbcType=VARCHAR}, #{createdby,jdbcType=VARCHAR}, #{createdon,jdbcType=TIMESTAMP}, - #{modifiedby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}) - insert into SysOrg @@ -356,6 +346,9 @@ OrgLevel = #{orglevel,jdbcType=INTEGER}, SuperiorOrgCode = #{superiororgcode,jdbcType=VARCHAR}, charger = #{charger,jdbcType=VARCHAR}, + sort_id = #{sortId,jdbcType=VARCHAR}, + parent_path = #{parentPath,jdbcType=VARCHAR}, + parent_name = #{parentName,jdbcType=VARCHAR}, ModifiedBy = #{modifiedby,jdbcType=VARCHAR}, ModifiedOn = #{modifiedon,jdbcType=TIMESTAMP} where OrgCode = #{orgcode,jdbcType=VARCHAR} diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml index bda5d71..94d759f 100644 --- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml @@ -92,63 +92,7 @@ where SysEnterpriseId = #{sysenterpriseid,jdbcType=VARCHAR} - - insert into SysEnterprise (SysEnterpriseId, - OrgCode, - street_code, - community_code, - net_code, - - SuperiorEnterpriseId, - LowOrgCode, EntName,isHide, State,complite,sysUnitId,ManagerDept,dynamicRiskLevel,inherentRisk,manageType,EntType, - EntSection, BaseSafeClassId, BaseInClassId,work_class_id, - PinYin, Principal, - SysAddress, - safeTelephone, - safeManager, - PostCode, EcoType, PersonCount, - EntLogoPic, MaleCode, OrgPassNo, - LegalRepre, LRIDCard, LRLinkTel, - EstablishDate, RiskLevel, Latitude, - Longitude, IsBlackList, Comments, - ISMaleCode, EntScore, EntHouseNum, - CreatedOn, CreatedBy, ModifiedOn, - ModifiedBy,qr_code) - values ( - #{sysenterpriseid,jdbcType=VARCHAR}, - #{orgcode,jdbcType=VARCHAR}, - #{streetCode,jdbcType=VARCHAR}, - #{communityCode,jdbcType=VARCHAR}, - #{netCode,jdbcType=VARCHAR}, - #{superiorenterpriseid,jdbcType=VARCHAR}, - #{loworgcode,jdbcType=VARCHAR}, - #{entname,jdbcType=VARCHAR}, - #{isHide,jdbcType=VARCHAR}, - #{state,jdbcType=VARCHAR}, - #{complite,jdbcType=VARCHAR}, - #{sysUnitId,jdbcType=VARCHAR}, - #{managerDept,jdbcType=VARCHAR}, - #{dynamicRiskLevel,jdbcType=VARCHAR}, - #{inherentRisk,jdbcType=VARCHAR}, - #{manageType,jdbcType=VARCHAR}, - #{enttype,jdbcType=VARCHAR}, - #{entsection,jdbcType=VARCHAR}, #{basesafeclassid,jdbcType=VARCHAR}, - #{baseinclassid,jdbcType=VARCHAR}, - #{workClassId,jdbcType=VARCHAR}, - #{pinyin,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, - #{sysaddress,jdbcType=VARCHAR}, - #{safeTelephone,jdbcType=VARCHAR}, - #{safeManager,jdbcType=VARCHAR}, - #{postcode,jdbcType=VARCHAR}, #{ecotype,jdbcType=VARCHAR}, #{personcount,jdbcType=INTEGER}, - #{entlogopic,jdbcType=VARCHAR}, #{malecode,jdbcType=VARCHAR}, #{orgpassno,jdbcType=VARCHAR}, - #{legalrepre,jdbcType=VARCHAR}, #{lridcard,jdbcType=VARCHAR}, #{lrlinktel,jdbcType=VARCHAR}, - #{establishdate,jdbcType=TIMESTAMP}, #{risklevel,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, - #{longitude,jdbcType=VARCHAR}, #{isblacklist,jdbcType=VARCHAR}, #{comments,jdbcType=VARCHAR}, - #{ismalecode,jdbcType=VARCHAR}, #{entscore,jdbcType=VARCHAR}, #{enthousenum,jdbcType=VARCHAR}, - #{createdon,jdbcType=TIMESTAMP}, #{createdby,jdbcType=VARCHAR}, #{modifiedon,jdbcType=TIMESTAMP}, - #{modifiedby,jdbcType=VARCHAR},#{qrCode}) - insert into SysEnterprise @@ -586,7 +530,9 @@ street_code = #{streetCode,jdbcType=VARCHAR}, community_code = #{communityCode,jdbcType=VARCHAR}, OrgCode = #{orgcode,jdbcType=VARCHAR}, - OrgCode = #{orgcode,jdbcType=VARCHAR}, + area_code = #{areaCode,jdbcType=VARCHAR}, + area_path = #{areaPath,jdbcType=VARCHAR}, + area_name = #{areaName,jdbcType=VARCHAR}, SuperiorEnterpriseId = #{superiorenterpriseid,jdbcType=VARCHAR}, LowOrgCode = #{loworgcode,jdbcType=VARCHAR}, EntName = #{entname,jdbcType=VARCHAR}, @@ -801,9 +747,7 @@ #{inherentRisk} - AND (sys.`OrgCode` = #{areaCode} - OR sys.`street_code` = #{areaCode} - OR sys.`community_code` = #{areaCode}) + AND FIND_IN_SET(#{areaCode},sys.area_path) and sys.EntName like concat('%',#{entName},'%') diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 3366ced..ff4bc4f 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -2725,7 +2725,7 @@ public class BaseController { } /** - * 获取用户地区id + * 获取用户地区idchangeArea * @return * @throws Exception */ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java index 4a93f4c..1f769cd 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java @@ -868,9 +868,30 @@ public class SettingController extends BaseController{ sysOrg.setModifiedon(new Date()); sysOrg.setCreatedon(new Date()); - //计算东区等级 - if(StringUtils.isNotBlank(sysOrg.getSuperiororgcode())){ - SysOrg superOrg = sysOrgMapper.selectByPrimaryKey(sysOrg.getSuperiororgcode()); + + + if(StringUtils.isNotBlank(sysOrg.getOrgcode())){ + handleAreaParent(sysOrg.getSuperiororgcode(),sysOrg); + sysOrgMapper.changeArea(sysOrg); + }else{ + sysOrg.setOrgcode(RandomNumber.getUUid()); + handleAreaParent(sysOrg.getSuperiororgcode(),sysOrg); + sysOrgMapper.insert(sysOrg); + } + + return result; + } + + /** + * 处理地区信息 + * @version v1.0 + * @author dong + * @date 2022/11/1 14:20 + */ + public void handleAreaParent(String superiororgcod,SysOrg sysOrg)throws Exception{ + //计算地区等级 + if(StringUtils.isNotBlank(superiororgcod)){ + SysOrg superOrg = sysOrgMapper.selectById(superiororgcod); if(null != superOrg){ Integer orgLevel = superOrg.getOrglevel(); orgLevel += 1; @@ -883,16 +904,6 @@ public class SettingController extends BaseController{ sysOrg.setParentName(sysOrg.getOrgname()); sysOrg.setOrglevel(2); } - - if(StringUtils.isNotBlank(sysOrg.getOrgcode())){ - - sysOrgMapper.changeArea(sysOrg); - }else{ - sysOrg.setOrgcode(RandomNumber.getUUid()); - sysOrgMapper.insert(sysOrg); - } - - return result; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index f15ef30..90c4d02 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -564,12 +564,16 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { singleResult.setCode(Code.ERROR.getCode()); return singleResult; } + + + getEntAreaCode(sysEnterpriseDo.getAreaCode(),sysEnterprise); + sysEnterprise.setCreatedon(new Date()); sysEnterprise.setModifiedon(new Date()); sysEnterprise.setSysenterpriseid(RandomNumber.getUUid()); sysEnterprise.setDynamicRiskLevel("100");//新建企业默认100分数 sysEnterprise.setQrCode(entQrCode(sysEnterprise.getSysenterpriseid())); - result = sysEnterpriseMapper.insert(sysEnterprise); + sysEnterpriseMapper.insert(sysEnterprise); }else { SysEnterprise verifyEnterprise = sysEnterpriseMapper.selectByName(sysEnterpriseDo.getEntname(),sysEnterpriseDo.getSysenterpriseid()); @@ -585,8 +589,10 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { sysEnterprise.setQrCode(entQrCode(sysEnterprise.getSysenterpriseid())); } + getEntAreaCode(sysEnterpriseDo.getAreaCode(),sysEnterprise); + sysEnterprise.setModifiedon(new Date()); - result = sysEnterpriseMapper.updateByPrimaryKey(sysEnterprise); + sysEnterpriseMapper.updateByPrimaryKey(sysEnterprise); } @@ -596,17 +602,28 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); - if (result > 0){ - singleResult.setMessage(Message.SUCCESS); - singleResult.setCode(Code.SUCCESS.getCode()); - }else { - singleResult.setMessage(Message.ERROR); - singleResult.setCode(Code.ERROR.getCode()); - } + return singleResult; } + /** + * 处理企业地区信息 + * @version v1.0 + * @author dong + * @date 2022/11/1 14:40 + */ + public void getEntAreaCode(String areaCode,SysEnterprise enterprise)throws Exception{ + if(StringUtils.isNotBlank(areaCode)){ + SysOrg sysOrg = sysOrgMapper.selectById(areaCode); + if(null != sysOrg){ + enterprise.setAreaCode(areaCode); + enterprise.setAreaPath(sysOrg.getParentPath()); + enterprise.setAreaName(sysOrg.getParentName()); + } + } + } +