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 ad3608e..252689c 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysOrgMapper.java @@ -1,9 +1,11 @@ package com.rzyc.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.rzyc.bean.bigdata.AreaInfo; import com.rzyc.bean.organization.vo.CountByOrg; import com.rzyc.model.SysOrg; import com.rzyc.model.SysOrgExample; +import com.rzyc.model.oth.Manual; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -11,7 +13,7 @@ import java.util.List; import java.util.Map; @Repository -public interface SysOrgMapper { +public interface SysOrgMapper extends BaseMapper { long countByExample(SysOrgExample example); int deleteByExample(SysOrgExample example); @@ -46,9 +48,14 @@ public interface SysOrgMapper { /*查询所有*/ List findAll(); + /*用户地区*/ + List findUserArea(@Param("userArea") String userArea); + + /*查询所有*/ List areaPage(@Param("condition") String condition, - @Param("orgcode") String orgcode); + @Param("orgcode") String orgcode, + @Param("userArea") String userArea); /*修改地区*/ int changeArea(SysOrg record); @@ -84,4 +91,7 @@ public interface SysOrgMapper { List checkSysOrg(@Param("superiorOrgCode") String superiorOrgCode, @Param("startTime") String startTime, @Param("endTime") String endTime); + + /*按照等级查询*/ + List findByLevel(@Param("orgLevel") Integer orgLevel); } 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 3aa9b63..f3554a3 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 @@ -1,5 +1,6 @@ package com.rzyc.mapper.ent; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.rzyc.bean.bigdata.EntRsikNum; import com.rzyc.bean.bigdata.FiveEntScore; import com.rzyc.bean.bigdata.GetSysEnterpriseNum; @@ -19,8 +20,8 @@ import com.rzyc.bean.organization.dto.ManageEnterpriseListDto; import com.rzyc.bean.organization.vo.AreaEntNum; import com.rzyc.bean.organization.vo.EnterpriseVo; import com.rzyc.bean.organization.vo.OrganizationNum; +import com.rzyc.model.SysOrg; import com.rzyc.model.ent.SysEnterprise; -import com.rzyc.model.ent.SysEnterpriseExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,10 +29,8 @@ import java.util.List; import java.util.Map; @Repository -public interface SysEnterpriseMapper { - long countByExample(SysEnterpriseExample example); +public interface SysEnterpriseMapper extends BaseMapper { - int deleteByExample(SysEnterpriseExample example); int deleteByPrimaryKey(String sysenterpriseid); @@ -39,13 +38,10 @@ public interface SysEnterpriseMapper { int insertSelective(SysEnterprise record); - List selectByExample(SysEnterpriseExample example); SysEnterprise selectByPrimaryKey(@Param("sysenterpriseid") String sysenterpriseid); - int updateByExampleSelective(@Param("record") SysEnterprise record, @Param("example") SysEnterpriseExample example); - int updateByExample(@Param("record") SysEnterprise record, @Param("example") SysEnterpriseExample example); int updateByPrimaryKeySelective(SysEnterprise record); diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java b/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java index 043e3f1..1c1fe61 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java +++ b/inventory-dao/src/main/java/com/rzyc/model/SysOrg.java @@ -1,5 +1,8 @@ package com.rzyc.model; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -11,34 +14,96 @@ import java.util.List; * @author */ @ApiModel("地区列表") +@TableName("sysorg") public class SysOrg implements Serializable { + @TableId("OrgCode") @ApiModelProperty("地区编码") private String orgcode; + @TableField("OrgName") @ApiModelProperty("地区名") private String orgname; + @TableField(exist = false) @ApiModelProperty("父级地区名") private String superName; + @TableField("charger") @ApiModelProperty("负责人") private String charger; + @ApiModelProperty("级别 1 省 2 市 3 区 4 乡镇/街道") + @TableField("OrgLevel") private Integer orglevel; + @TableField("org_type") private String orgType; + @ApiModelProperty("父级") + @TableField("SuperiorOrgCode") private String superiororgcode; + @TableField("CreatedBy") private String createdby; + @TableField("CreatedOn") private Date createdon; + @TableField("ModifiedBy") private String modifiedby; + @TableField("ModifiedOn") private Date modifiedon; + @ApiModelProperty("经度") + @TableField("lon") + private String lon; + + @ApiModelProperty("纬度") + @TableField("lat") + private String lat; + + @ApiModelProperty("排序") + @TableField("sort_id") + private String sortId; + + @ApiModelProperty("父级级别") + @TableField("parent_path") + private String parentPath; + + @ApiModelProperty("父级名称") + @TableField("parent_name") + private String parentName; + + @TableField(exist = false) + @ApiModelProperty("子级") + private List children; + + @ApiModelProperty("企业数") + @TableField(exist = false) + private Integer totalEnt; + + @ApiModelProperty("检查数") + @TableField(exist = false) + private Integer checkEnt; + + public Integer getTotalEnt() { + return totalEnt; + } + + public void setTotalEnt(Integer totalEnt) { + this.totalEnt = totalEnt; + } + + public Integer getCheckEnt() { + return checkEnt; + } + + public void setCheckEnt(Integer checkEnt) { + this.checkEnt = checkEnt; + } + public String getCharger() { return charger; } @@ -47,8 +112,45 @@ public class SysOrg implements Serializable { this.charger = charger; } - @ApiModelProperty("子级") - private List children; + public String getLon() { + return lon; + } + + public void setLon(String lon) { + this.lon = lon; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getSortId() { + return sortId; + } + + public void setSortId(String sortId) { + this.sortId = sortId; + } + + public String getParentPath() { + return parentPath; + } + + public void setParentPath(String parentPath) { + this.parentPath = parentPath; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } private static final long serialVersionUID = 1L; 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 757ddd4..48007b9 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 @@ -1,6 +1,9 @@ package com.rzyc.model.ent; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.common.utils.excel.ExcelColumn; import com.fasterxml.jackson.annotation.JsonFormat; import com.rzyc.bean.Feature; @@ -18,44 +21,70 @@ import java.util.List; * @author */ @ApiModel("企业表") +@TableName("sysenterprise") public class SysEnterprise implements Serializable { @ApiModelProperty("主键") + @TableId("SysEnterpriseId") private String sysenterpriseid; + @TableField("OrgCode") @ApiModelProperty("区id") private String orgcode; + @TableField("street_code") @ApiModelProperty("街道id") private String streetCode; + @TableField(exist = false) @ExcelColumn(value = "街道", col = 3) private String streetName; + @TableField("community_code") @ApiModelProperty("社区/村id") private String communityCode; + @TableField(exist = false) @ExcelColumn(value = "社区", col = 4) private String communityName; + @TableField("net_code") @ApiModelProperty("组/网格id") private String netCode; + @TableField("area_code") + @ApiModelProperty("地区id") + private String areaCode; + @TableField("area_path") + @ApiModelProperty("地区路径") + private String areaPath; + + @TableField("area_name") + @ApiModelProperty("地区名路径") + private String areaName; + + + @TableField(exist = false) @ApiModelProperty("经营范围") private String ManageType; /** * 地区名 */ + @TableField(exist = false) @ExcelColumn(value = "区", col = 2) @ApiModelProperty("区") private String orgName; + @TableField("SuperiorEnterpriseId") private String superiorenterpriseid; + @TableField("LowOrgCode") private String loworgcode; + + @TableField("EntName") @ExcelColumn(value = "企业名称", col = 1) @ApiModelProperty("企业名称") private String entname; @@ -63,6 +92,7 @@ public class SysEnterprise implements Serializable { /** * 经营范围 */ + @TableField("ManageType") @ApiModelProperty("经营范围") private String manageType; @@ -71,80 +101,111 @@ public class SysEnterprise implements Serializable { */ @ApiModelProperty("静态风险等级 红：4 橙：3 黄：2 蓝：1") @ExcelColumn(value = "静态风险等级 红：4 橙：3 黄：2 蓝：1", col = 8) + @TableField("InherentRisk") private String inherentRisk = RiskLevel.BLUE.getLevel()+""; /** * 动态风险等级 */ + @TableField("DynamicRiskLevel") private String dynamicRiskLevel; /** * 标准化等级 */ + @TableField("Complite") private String complite; + @TableField("EntType") private String enttype; + @TableField("EntSection") private String entsection; /** * 部门id */ + @TableField("SysUnitId") @ApiModelProperty("部门") private String sysUnitId; /** * 主管部门 */ + @TableField("ManagerDept") @ApiModelProperty("主管部门id") private String managerDept; /** * 主管部门名 */ + @TableField(exist = false) @ApiModelProperty("主管名称") private String managerDeptName; + + @TableField("BaseSafeClassId") @ApiModelProperty("涉及安全类别") private String basesafeclassid; + + @TableField("BaseInClassId") @ApiModelProperty("行业id") private String baseinclassid; + + @TableField("work_class_id") @ApiModelProperty("最小工作单元行业") private String workClassId; + @TableField("PinYin") private String pinyin; + + @TableField("Principal") private String principal; + @TableField("SysAddress") @ExcelColumn(value = "公司地址", col = 5) @ApiModelProperty("公司地址") private String sysaddress; + + @TableField("PostCode") private String postcode; + @TableField("EcoType") private String ecotype; + @TableField("PersonCount") private Integer personcount; + @TableField("EntLogoPic") private String entlogopic; + @TableField("MaleCode") private String malecode; + + @TableField("OrgPassNo") private String orgpassno; + @TableField("LegalRepre") @ExcelColumn(value = "企业法人", col = 6) private String legalrepre; + @TableField("LRIDCard") private String lridcard; + @TableField("LRLinkTel") @ExcelColumn(value = "联系方式", col = 7) private String lrlinktel; + @TableField("EstablishDate") @ApiModelProperty("成立时间") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date establishdate; + @TableField("RiskLevel") @ApiModelProperty("动态风险等级") @ExcelColumn(value = "动态风险等级", col = 9) private String risklevel = RiskLevel.BLUE.getLevelDesc(); @@ -152,128 +213,172 @@ public class SysEnterprise implements Serializable { /** * 风险颜色 */ + @TableField(exist = false) private String risklevelColor; + + @TableField("Latitude") @ApiModelProperty("纬度") private String latitude; + + @TableField("Longitude") @ApiModelProperty("经度") private String longitude; + @TableField("IsBlackList") private String isblacklist; + @TableField("Comments") private String comments; + + @TableField("ISMaleCode") private String ismalecode; + + @TableField("EntScore") private String entscore; + + @TableField("EntHouseNum") private String enthousenum; + @TableField("CreatedOn") private Date createdon; + @TableField("CreatedBy") private String createdby; + + @TableField("ModifiedOn") private Date modifiedon; + @TableField("ModifiedBy") private String modifiedby; /** * 行业名 */ + @TableField(exist = false) private String industryClassName; /** * 顶级行业名 */ + @TableField(exist = false) private String superClassName; /** * 安全类别列表 */ + @TableField(exist = false) private JSONArray safeClasses; /** * 安全类别名 */ + @TableField(exist = false) private String safeClassName; /** *安全管理人员 */ + @TableField("SafeManager") private String safeManager; /** * 安全管理人员联系方式 */ + @TableField("SafeTelephone") private String safeTelephone; /** * 企业状态 */ + @TableField("State") @ExcelColumn(value = "企业状态", col = 11) private String state = "启用"; /** * 是否隐藏 */ + @TableField("IsHide") @ApiModelProperty("是否隐藏否") private String isHide = "否"; //镇街包片领导 + @TableField(exist = false) private String leaderInfo; //镇街定点干部 + @TableField(exist = false) private String cadreInfo; //村社定点干部 + @TableField(exist = false) private String villageInfo; /** * 特性字段 */ + @TableField(exist = false) private List features = new LinkedList<>(); /** * 部门列表 */ + @TableField(exist = false) private List units; + @TableField(exist = false) private String safeIdName; + @TableField(exist = false) private String inClassName; //最小工作单元分类 + @TableField(exist = false) @ExcelColumn(value = "企业分类", col = 10) private String workClassName; + @TableField(exist = false) private String sysUnitName; - //二维码 + + @TableField("qr_code") private String qrCode; //被选数量 + @TableField(exist = false) private Integer treeNum; //检查数 + @TableField(exist = false) private Integer checkNum; /*责任树被选择数量*/ + @TableField(exist = false) private Integer choiceNum; + @TableField(exist = false) @ApiModelProperty("检查总数") private Integer checkCount; + @TableField(exist = false) @ApiModelProperty("隐患总数") private Integer dangerCount; + @TableField(exist = false) @ApiModelProperty("已整改") private Integer rectifiedCount; + @TableField(exist = false) @ApiModelProperty("整改中") private Integer rectificationCount; + @TableField(exist = false) @ApiModelProperty("未整改") private Integer notRectificationCount; - + private static final long serialVersionUID = 1L; public Integer getCheckCount() { return checkCount; @@ -315,7 +420,6 @@ public class SysEnterprise implements Serializable { this.notRectificationCount = notRectificationCount; } - private static final long serialVersionUID = 1L; public Integer getChoiceNum() { return choiceNum; @@ -429,10 +533,6 @@ public class SysEnterprise implements Serializable { this.qrCode = qrCode; } - public static long getSerialVersionUID() { - return serialVersionUID; - } - public String getSysUnitName() { return sysUnitName; } @@ -1010,7 +1110,6 @@ public class SysEnterprise implements Serializable { sb.append(", createdby=").append(createdby); sb.append(", modifiedon=").append(modifiedon); sb.append(", modifiedby=").append(modifiedby); - sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterpriseExample.java b/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterpriseExample.java deleted file mode 100644 index b122e8e..0000000 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/SysEnterpriseExample.java +++ /dev/null @@ -1,2563 +0,0 @@ -package com.rzyc.model.ent; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysEnterpriseExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SysEnterpriseExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andSysenterpriseidIsNull() { - addCriterion("SysEnterpriseId is null"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidIsNotNull() { - addCriterion("SysEnterpriseId is not null"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidEqualTo(String value) { - addCriterion("SysEnterpriseId =", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidNotEqualTo(String value) { - addCriterion("SysEnterpriseId <>", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidGreaterThan(String value) { - addCriterion("SysEnterpriseId >", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidGreaterThanOrEqualTo(String value) { - addCriterion("SysEnterpriseId >=", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidLessThan(String value) { - addCriterion("SysEnterpriseId <", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidLessThanOrEqualTo(String value) { - addCriterion("SysEnterpriseId <=", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidLike(String value) { - addCriterion("SysEnterpriseId like", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidNotLike(String value) { - addCriterion("SysEnterpriseId not like", value, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidIn(List values) { - addCriterion("SysEnterpriseId in", values, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidNotIn(List values) { - addCriterion("SysEnterpriseId not in", values, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidBetween(String value1, String value2) { - addCriterion("SysEnterpriseId between", value1, value2, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andSysenterpriseidNotBetween(String value1, String value2) { - addCriterion("SysEnterpriseId not between", value1, value2, "sysenterpriseid"); - return (Criteria) this; - } - - public Criteria andOrgcodeIsNull() { - addCriterion("OrgCode is null"); - return (Criteria) this; - } - - public Criteria andOrgcodeIsNotNull() { - addCriterion("OrgCode is not null"); - return (Criteria) this; - } - - public Criteria andOrgcodeEqualTo(String value) { - addCriterion("OrgCode =", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeNotEqualTo(String value) { - addCriterion("OrgCode <>", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeGreaterThan(String value) { - addCriterion("OrgCode >", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeGreaterThanOrEqualTo(String value) { - addCriterion("OrgCode >=", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeLessThan(String value) { - addCriterion("OrgCode <", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeLessThanOrEqualTo(String value) { - addCriterion("OrgCode <=", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeLike(String value) { - addCriterion("OrgCode like", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeNotLike(String value) { - addCriterion("OrgCode not like", value, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeIn(List values) { - addCriterion("OrgCode in", values, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeNotIn(List values) { - addCriterion("OrgCode not in", values, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeBetween(String value1, String value2) { - addCriterion("OrgCode between", value1, value2, "orgcode"); - return (Criteria) this; - } - - public Criteria andOrgcodeNotBetween(String value1, String value2) { - addCriterion("OrgCode not between", value1, value2, "orgcode"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidIsNull() { - addCriterion("SuperiorEnterpriseId is null"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidIsNotNull() { - addCriterion("SuperiorEnterpriseId is not null"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidEqualTo(String value) { - addCriterion("SuperiorEnterpriseId =", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidNotEqualTo(String value) { - addCriterion("SuperiorEnterpriseId <>", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidGreaterThan(String value) { - addCriterion("SuperiorEnterpriseId >", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidGreaterThanOrEqualTo(String value) { - addCriterion("SuperiorEnterpriseId >=", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidLessThan(String value) { - addCriterion("SuperiorEnterpriseId <", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidLessThanOrEqualTo(String value) { - addCriterion("SuperiorEnterpriseId <=", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidLike(String value) { - addCriterion("SuperiorEnterpriseId like", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidNotLike(String value) { - addCriterion("SuperiorEnterpriseId not like", value, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidIn(List values) { - addCriterion("SuperiorEnterpriseId in", values, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidNotIn(List values) { - addCriterion("SuperiorEnterpriseId not in", values, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidBetween(String value1, String value2) { - addCriterion("SuperiorEnterpriseId between", value1, value2, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andSuperiorenterpriseidNotBetween(String value1, String value2) { - addCriterion("SuperiorEnterpriseId not between", value1, value2, "superiorenterpriseid"); - return (Criteria) this; - } - - public Criteria andLoworgcodeIsNull() { - addCriterion("LowOrgCode is null"); - return (Criteria) this; - } - - public Criteria andLoworgcodeIsNotNull() { - addCriterion("LowOrgCode is not null"); - return (Criteria) this; - } - - public Criteria andLoworgcodeEqualTo(String value) { - addCriterion("LowOrgCode =", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeNotEqualTo(String value) { - addCriterion("LowOrgCode <>", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeGreaterThan(String value) { - addCriterion("LowOrgCode >", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeGreaterThanOrEqualTo(String value) { - addCriterion("LowOrgCode >=", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeLessThan(String value) { - addCriterion("LowOrgCode <", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeLessThanOrEqualTo(String value) { - addCriterion("LowOrgCode <=", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeLike(String value) { - addCriterion("LowOrgCode like", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeNotLike(String value) { - addCriterion("LowOrgCode not like", value, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeIn(List values) { - addCriterion("LowOrgCode in", values, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeNotIn(List values) { - addCriterion("LowOrgCode not in", values, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeBetween(String value1, String value2) { - addCriterion("LowOrgCode between", value1, value2, "loworgcode"); - return (Criteria) this; - } - - public Criteria andLoworgcodeNotBetween(String value1, String value2) { - addCriterion("LowOrgCode not between", value1, value2, "loworgcode"); - return (Criteria) this; - } - - public Criteria andEntnameIsNull() { - addCriterion("EntName is null"); - return (Criteria) this; - } - - public Criteria andEntnameIsNotNull() { - addCriterion("EntName is not null"); - return (Criteria) this; - } - - public Criteria andEntnameEqualTo(String value) { - addCriterion("EntName =", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameNotEqualTo(String value) { - addCriterion("EntName <>", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameGreaterThan(String value) { - addCriterion("EntName >", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameGreaterThanOrEqualTo(String value) { - addCriterion("EntName >=", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameLessThan(String value) { - addCriterion("EntName <", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameLessThanOrEqualTo(String value) { - addCriterion("EntName <=", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameLike(String value) { - addCriterion("EntName like", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameNotLike(String value) { - addCriterion("EntName not like", value, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameIn(List values) { - addCriterion("EntName in", values, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameNotIn(List values) { - addCriterion("EntName not in", values, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameBetween(String value1, String value2) { - addCriterion("EntName between", value1, value2, "entname"); - return (Criteria) this; - } - - public Criteria andEntnameNotBetween(String value1, String value2) { - addCriterion("EntName not between", value1, value2, "entname"); - return (Criteria) this; - } - - public Criteria andEnttypeIsNull() { - addCriterion("EntType is null"); - return (Criteria) this; - } - - public Criteria andEnttypeIsNotNull() { - addCriterion("EntType is not null"); - return (Criteria) this; - } - - public Criteria andEnttypeEqualTo(String value) { - addCriterion("EntType =", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeNotEqualTo(String value) { - addCriterion("EntType <>", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeGreaterThan(String value) { - addCriterion("EntType >", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeGreaterThanOrEqualTo(String value) { - addCriterion("EntType >=", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeLessThan(String value) { - addCriterion("EntType <", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeLessThanOrEqualTo(String value) { - addCriterion("EntType <=", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeLike(String value) { - addCriterion("EntType like", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeNotLike(String value) { - addCriterion("EntType not like", value, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeIn(List values) { - addCriterion("EntType in", values, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeNotIn(List values) { - addCriterion("EntType not in", values, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeBetween(String value1, String value2) { - addCriterion("EntType between", value1, value2, "enttype"); - return (Criteria) this; - } - - public Criteria andEnttypeNotBetween(String value1, String value2) { - addCriterion("EntType not between", value1, value2, "enttype"); - return (Criteria) this; - } - - public Criteria andEntsectionIsNull() { - addCriterion("EntSection is null"); - return (Criteria) this; - } - - public Criteria andEntsectionIsNotNull() { - addCriterion("EntSection is not null"); - return (Criteria) this; - } - - public Criteria andEntsectionEqualTo(String value) { - addCriterion("EntSection =", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionNotEqualTo(String value) { - addCriterion("EntSection <>", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionGreaterThan(String value) { - addCriterion("EntSection >", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionGreaterThanOrEqualTo(String value) { - addCriterion("EntSection >=", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionLessThan(String value) { - addCriterion("EntSection <", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionLessThanOrEqualTo(String value) { - addCriterion("EntSection <=", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionLike(String value) { - addCriterion("EntSection like", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionNotLike(String value) { - addCriterion("EntSection not like", value, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionIn(List values) { - addCriterion("EntSection in", values, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionNotIn(List values) { - addCriterion("EntSection not in", values, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionBetween(String value1, String value2) { - addCriterion("EntSection between", value1, value2, "entsection"); - return (Criteria) this; - } - - public Criteria andEntsectionNotBetween(String value1, String value2) { - addCriterion("EntSection not between", value1, value2, "entsection"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidIsNull() { - addCriterion("BaseSafeClassId is null"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidIsNotNull() { - addCriterion("BaseSafeClassId is not null"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidEqualTo(String value) { - addCriterion("BaseSafeClassId =", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidNotEqualTo(String value) { - addCriterion("BaseSafeClassId <>", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidGreaterThan(String value) { - addCriterion("BaseSafeClassId >", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidGreaterThanOrEqualTo(String value) { - addCriterion("BaseSafeClassId >=", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidLessThan(String value) { - addCriterion("BaseSafeClassId <", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidLessThanOrEqualTo(String value) { - addCriterion("BaseSafeClassId <=", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidLike(String value) { - addCriterion("BaseSafeClassId like", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidNotLike(String value) { - addCriterion("BaseSafeClassId not like", value, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidIn(List values) { - addCriterion("BaseSafeClassId in", values, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidNotIn(List values) { - addCriterion("BaseSafeClassId not in", values, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidBetween(String value1, String value2) { - addCriterion("BaseSafeClassId between", value1, value2, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBasesafeclassidNotBetween(String value1, String value2) { - addCriterion("BaseSafeClassId not between", value1, value2, "basesafeclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidIsNull() { - addCriterion("BaseInClassId is null"); - return (Criteria) this; - } - - public Criteria andBaseinclassidIsNotNull() { - addCriterion("BaseInClassId is not null"); - return (Criteria) this; - } - - public Criteria andBaseinclassidEqualTo(String value) { - addCriterion("BaseInClassId =", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidNotEqualTo(String value) { - addCriterion("BaseInClassId <>", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidGreaterThan(String value) { - addCriterion("BaseInClassId >", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidGreaterThanOrEqualTo(String value) { - addCriterion("BaseInClassId >=", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidLessThan(String value) { - addCriterion("BaseInClassId <", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidLessThanOrEqualTo(String value) { - addCriterion("BaseInClassId <=", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidLike(String value) { - addCriterion("BaseInClassId like", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidNotLike(String value) { - addCriterion("BaseInClassId not like", value, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidIn(List values) { - addCriterion("BaseInClassId in", values, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidNotIn(List values) { - addCriterion("BaseInClassId not in", values, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidBetween(String value1, String value2) { - addCriterion("BaseInClassId between", value1, value2, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andBaseinclassidNotBetween(String value1, String value2) { - addCriterion("BaseInClassId not between", value1, value2, "baseinclassid"); - return (Criteria) this; - } - - public Criteria andPinyinIsNull() { - addCriterion("PinYin is null"); - return (Criteria) this; - } - - public Criteria andPinyinIsNotNull() { - addCriterion("PinYin is not null"); - return (Criteria) this; - } - - public Criteria andPinyinEqualTo(String value) { - addCriterion("PinYin =", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinNotEqualTo(String value) { - addCriterion("PinYin <>", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinGreaterThan(String value) { - addCriterion("PinYin >", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinGreaterThanOrEqualTo(String value) { - addCriterion("PinYin >=", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinLessThan(String value) { - addCriterion("PinYin <", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinLessThanOrEqualTo(String value) { - addCriterion("PinYin <=", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinLike(String value) { - addCriterion("PinYin like", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinNotLike(String value) { - addCriterion("PinYin not like", value, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinIn(List values) { - addCriterion("PinYin in", values, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinNotIn(List values) { - addCriterion("PinYin not in", values, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinBetween(String value1, String value2) { - addCriterion("PinYin between", value1, value2, "pinyin"); - return (Criteria) this; - } - - public Criteria andPinyinNotBetween(String value1, String value2) { - addCriterion("PinYin not between", value1, value2, "pinyin"); - return (Criteria) this; - } - - public Criteria andPrincipalIsNull() { - addCriterion("Principal is null"); - return (Criteria) this; - } - - public Criteria andPrincipalIsNotNull() { - addCriterion("Principal is not null"); - return (Criteria) this; - } - - public Criteria andPrincipalEqualTo(String value) { - addCriterion("Principal =", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalNotEqualTo(String value) { - addCriterion("Principal <>", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalGreaterThan(String value) { - addCriterion("Principal >", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalGreaterThanOrEqualTo(String value) { - addCriterion("Principal >=", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalLessThan(String value) { - addCriterion("Principal <", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalLessThanOrEqualTo(String value) { - addCriterion("Principal <=", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalLike(String value) { - addCriterion("Principal like", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalNotLike(String value) { - addCriterion("Principal not like", value, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalIn(List values) { - addCriterion("Principal in", values, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalNotIn(List values) { - addCriterion("Principal not in", values, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalBetween(String value1, String value2) { - addCriterion("Principal between", value1, value2, "principal"); - return (Criteria) this; - } - - public Criteria andPrincipalNotBetween(String value1, String value2) { - addCriterion("Principal not between", value1, value2, "principal"); - return (Criteria) this; - } - - public Criteria andSysaddressIsNull() { - addCriterion("SysAddress is null"); - return (Criteria) this; - } - - public Criteria andSysaddressIsNotNull() { - addCriterion("SysAddress is not null"); - return (Criteria) this; - } - - public Criteria andSysaddressEqualTo(String value) { - addCriterion("SysAddress =", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressNotEqualTo(String value) { - addCriterion("SysAddress <>", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressGreaterThan(String value) { - addCriterion("SysAddress >", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressGreaterThanOrEqualTo(String value) { - addCriterion("SysAddress >=", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressLessThan(String value) { - addCriterion("SysAddress <", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressLessThanOrEqualTo(String value) { - addCriterion("SysAddress <=", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressLike(String value) { - addCriterion("SysAddress like", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressNotLike(String value) { - addCriterion("SysAddress not like", value, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressIn(List values) { - addCriterion("SysAddress in", values, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressNotIn(List values) { - addCriterion("SysAddress not in", values, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressBetween(String value1, String value2) { - addCriterion("SysAddress between", value1, value2, "sysaddress"); - return (Criteria) this; - } - - public Criteria andSysaddressNotBetween(String value1, String value2) { - addCriterion("SysAddress not between", value1, value2, "sysaddress"); - return (Criteria) this; - } - - public Criteria andPostcodeIsNull() { - addCriterion("PostCode is null"); - return (Criteria) this; - } - - public Criteria andPostcodeIsNotNull() { - addCriterion("PostCode is not null"); - return (Criteria) this; - } - - public Criteria andPostcodeEqualTo(String value) { - addCriterion("PostCode =", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeNotEqualTo(String value) { - addCriterion("PostCode <>", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeGreaterThan(String value) { - addCriterion("PostCode >", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeGreaterThanOrEqualTo(String value) { - addCriterion("PostCode >=", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeLessThan(String value) { - addCriterion("PostCode <", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeLessThanOrEqualTo(String value) { - addCriterion("PostCode <=", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeLike(String value) { - addCriterion("PostCode like", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeNotLike(String value) { - addCriterion("PostCode not like", value, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeIn(List values) { - addCriterion("PostCode in", values, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeNotIn(List values) { - addCriterion("PostCode not in", values, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeBetween(String value1, String value2) { - addCriterion("PostCode between", value1, value2, "postcode"); - return (Criteria) this; - } - - public Criteria andPostcodeNotBetween(String value1, String value2) { - addCriterion("PostCode not between", value1, value2, "postcode"); - return (Criteria) this; - } - - public Criteria andEcotypeIsNull() { - addCriterion("EcoType is null"); - return (Criteria) this; - } - - public Criteria andEcotypeIsNotNull() { - addCriterion("EcoType is not null"); - return (Criteria) this; - } - - public Criteria andEcotypeEqualTo(String value) { - addCriterion("EcoType =", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeNotEqualTo(String value) { - addCriterion("EcoType <>", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeGreaterThan(String value) { - addCriterion("EcoType >", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeGreaterThanOrEqualTo(String value) { - addCriterion("EcoType >=", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeLessThan(String value) { - addCriterion("EcoType <", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeLessThanOrEqualTo(String value) { - addCriterion("EcoType <=", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeLike(String value) { - addCriterion("EcoType like", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeNotLike(String value) { - addCriterion("EcoType not like", value, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeIn(List values) { - addCriterion("EcoType in", values, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeNotIn(List values) { - addCriterion("EcoType not in", values, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeBetween(String value1, String value2) { - addCriterion("EcoType between", value1, value2, "ecotype"); - return (Criteria) this; - } - - public Criteria andEcotypeNotBetween(String value1, String value2) { - addCriterion("EcoType not between", value1, value2, "ecotype"); - return (Criteria) this; - } - - public Criteria andPersoncountIsNull() { - addCriterion("PersonCount is null"); - return (Criteria) this; - } - - public Criteria andPersoncountIsNotNull() { - addCriterion("PersonCount is not null"); - return (Criteria) this; - } - - public Criteria andPersoncountEqualTo(Integer value) { - addCriterion("PersonCount =", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountNotEqualTo(Integer value) { - addCriterion("PersonCount <>", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountGreaterThan(Integer value) { - addCriterion("PersonCount >", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountGreaterThanOrEqualTo(Integer value) { - addCriterion("PersonCount >=", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountLessThan(Integer value) { - addCriterion("PersonCount <", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountLessThanOrEqualTo(Integer value) { - addCriterion("PersonCount <=", value, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountIn(List values) { - addCriterion("PersonCount in", values, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountNotIn(List values) { - addCriterion("PersonCount not in", values, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountBetween(Integer value1, Integer value2) { - addCriterion("PersonCount between", value1, value2, "personcount"); - return (Criteria) this; - } - - public Criteria andPersoncountNotBetween(Integer value1, Integer value2) { - addCriterion("PersonCount not between", value1, value2, "personcount"); - return (Criteria) this; - } - - public Criteria andEntlogopicIsNull() { - addCriterion("EntLogoPic is null"); - return (Criteria) this; - } - - public Criteria andEntlogopicIsNotNull() { - addCriterion("EntLogoPic is not null"); - return (Criteria) this; - } - - public Criteria andEntlogopicEqualTo(String value) { - addCriterion("EntLogoPic =", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicNotEqualTo(String value) { - addCriterion("EntLogoPic <>", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicGreaterThan(String value) { - addCriterion("EntLogoPic >", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicGreaterThanOrEqualTo(String value) { - addCriterion("EntLogoPic >=", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicLessThan(String value) { - addCriterion("EntLogoPic <", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicLessThanOrEqualTo(String value) { - addCriterion("EntLogoPic <=", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicLike(String value) { - addCriterion("EntLogoPic like", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicNotLike(String value) { - addCriterion("EntLogoPic not like", value, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicIn(List values) { - addCriterion("EntLogoPic in", values, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicNotIn(List values) { - addCriterion("EntLogoPic not in", values, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicBetween(String value1, String value2) { - addCriterion("EntLogoPic between", value1, value2, "entlogopic"); - return (Criteria) this; - } - - public Criteria andEntlogopicNotBetween(String value1, String value2) { - addCriterion("EntLogoPic not between", value1, value2, "entlogopic"); - return (Criteria) this; - } - - public Criteria andMalecodeIsNull() { - addCriterion("MaleCode is null"); - return (Criteria) this; - } - - public Criteria andMalecodeIsNotNull() { - addCriterion("MaleCode is not null"); - return (Criteria) this; - } - - public Criteria andMalecodeEqualTo(String value) { - addCriterion("MaleCode =", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeNotEqualTo(String value) { - addCriterion("MaleCode <>", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeGreaterThan(String value) { - addCriterion("MaleCode >", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeGreaterThanOrEqualTo(String value) { - addCriterion("MaleCode >=", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeLessThan(String value) { - addCriterion("MaleCode <", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeLessThanOrEqualTo(String value) { - addCriterion("MaleCode <=", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeLike(String value) { - addCriterion("MaleCode like", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeNotLike(String value) { - addCriterion("MaleCode not like", value, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeIn(List values) { - addCriterion("MaleCode in", values, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeNotIn(List values) { - addCriterion("MaleCode not in", values, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeBetween(String value1, String value2) { - addCriterion("MaleCode between", value1, value2, "malecode"); - return (Criteria) this; - } - - public Criteria andMalecodeNotBetween(String value1, String value2) { - addCriterion("MaleCode not between", value1, value2, "malecode"); - return (Criteria) this; - } - - public Criteria andOrgpassnoIsNull() { - addCriterion("OrgPassNo is null"); - return (Criteria) this; - } - - public Criteria andOrgpassnoIsNotNull() { - addCriterion("OrgPassNo is not null"); - return (Criteria) this; - } - - public Criteria andOrgpassnoEqualTo(String value) { - addCriterion("OrgPassNo =", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoNotEqualTo(String value) { - addCriterion("OrgPassNo <>", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoGreaterThan(String value) { - addCriterion("OrgPassNo >", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoGreaterThanOrEqualTo(String value) { - addCriterion("OrgPassNo >=", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoLessThan(String value) { - addCriterion("OrgPassNo <", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoLessThanOrEqualTo(String value) { - addCriterion("OrgPassNo <=", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoLike(String value) { - addCriterion("OrgPassNo like", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoNotLike(String value) { - addCriterion("OrgPassNo not like", value, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoIn(List values) { - addCriterion("OrgPassNo in", values, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoNotIn(List values) { - addCriterion("OrgPassNo not in", values, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoBetween(String value1, String value2) { - addCriterion("OrgPassNo between", value1, value2, "orgpassno"); - return (Criteria) this; - } - - public Criteria andOrgpassnoNotBetween(String value1, String value2) { - addCriterion("OrgPassNo not between", value1, value2, "orgpassno"); - return (Criteria) this; - } - - public Criteria andLegalrepreIsNull() { - addCriterion("LegalRepre is null"); - return (Criteria) this; - } - - public Criteria andLegalrepreIsNotNull() { - addCriterion("LegalRepre is not null"); - return (Criteria) this; - } - - public Criteria andLegalrepreEqualTo(String value) { - addCriterion("LegalRepre =", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreNotEqualTo(String value) { - addCriterion("LegalRepre <>", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreGreaterThan(String value) { - addCriterion("LegalRepre >", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreGreaterThanOrEqualTo(String value) { - addCriterion("LegalRepre >=", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreLessThan(String value) { - addCriterion("LegalRepre <", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreLessThanOrEqualTo(String value) { - addCriterion("LegalRepre <=", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreLike(String value) { - addCriterion("LegalRepre like", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreNotLike(String value) { - addCriterion("LegalRepre not like", value, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreIn(List values) { - addCriterion("LegalRepre in", values, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreNotIn(List values) { - addCriterion("LegalRepre not in", values, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreBetween(String value1, String value2) { - addCriterion("LegalRepre between", value1, value2, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLegalrepreNotBetween(String value1, String value2) { - addCriterion("LegalRepre not between", value1, value2, "legalrepre"); - return (Criteria) this; - } - - public Criteria andLridcardIsNull() { - addCriterion("LRIDCard is null"); - return (Criteria) this; - } - - public Criteria andLridcardIsNotNull() { - addCriterion("LRIDCard is not null"); - return (Criteria) this; - } - - public Criteria andLridcardEqualTo(String value) { - addCriterion("LRIDCard =", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardNotEqualTo(String value) { - addCriterion("LRIDCard <>", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardGreaterThan(String value) { - addCriterion("LRIDCard >", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardGreaterThanOrEqualTo(String value) { - addCriterion("LRIDCard >=", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardLessThan(String value) { - addCriterion("LRIDCard <", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardLessThanOrEqualTo(String value) { - addCriterion("LRIDCard <=", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardLike(String value) { - addCriterion("LRIDCard like", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardNotLike(String value) { - addCriterion("LRIDCard not like", value, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardIn(List values) { - addCriterion("LRIDCard in", values, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardNotIn(List values) { - addCriterion("LRIDCard not in", values, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardBetween(String value1, String value2) { - addCriterion("LRIDCard between", value1, value2, "lridcard"); - return (Criteria) this; - } - - public Criteria andLridcardNotBetween(String value1, String value2) { - addCriterion("LRIDCard not between", value1, value2, "lridcard"); - return (Criteria) this; - } - - public Criteria andLrlinktelIsNull() { - addCriterion("LRLinkTel is null"); - return (Criteria) this; - } - - public Criteria andLrlinktelIsNotNull() { - addCriterion("LRLinkTel is not null"); - return (Criteria) this; - } - - public Criteria andLrlinktelEqualTo(String value) { - addCriterion("LRLinkTel =", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelNotEqualTo(String value) { - addCriterion("LRLinkTel <>", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelGreaterThan(String value) { - addCriterion("LRLinkTel >", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelGreaterThanOrEqualTo(String value) { - addCriterion("LRLinkTel >=", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelLessThan(String value) { - addCriterion("LRLinkTel <", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelLessThanOrEqualTo(String value) { - addCriterion("LRLinkTel <=", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelLike(String value) { - addCriterion("LRLinkTel like", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelNotLike(String value) { - addCriterion("LRLinkTel not like", value, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelIn(List values) { - addCriterion("LRLinkTel in", values, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelNotIn(List values) { - addCriterion("LRLinkTel not in", values, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelBetween(String value1, String value2) { - addCriterion("LRLinkTel between", value1, value2, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andLrlinktelNotBetween(String value1, String value2) { - addCriterion("LRLinkTel not between", value1, value2, "lrlinktel"); - return (Criteria) this; - } - - public Criteria andEstablishdateIsNull() { - addCriterion("EstablishDate is null"); - return (Criteria) this; - } - - public Criteria andEstablishdateIsNotNull() { - addCriterion("EstablishDate is not null"); - return (Criteria) this; - } - - public Criteria andEstablishdateEqualTo(Date value) { - addCriterion("EstablishDate =", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateNotEqualTo(Date value) { - addCriterion("EstablishDate <>", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateGreaterThan(Date value) { - addCriterion("EstablishDate >", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateGreaterThanOrEqualTo(Date value) { - addCriterion("EstablishDate >=", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateLessThan(Date value) { - addCriterion("EstablishDate <", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateLessThanOrEqualTo(Date value) { - addCriterion("EstablishDate <=", value, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateIn(List values) { - addCriterion("EstablishDate in", values, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateNotIn(List values) { - addCriterion("EstablishDate not in", values, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateBetween(Date value1, Date value2) { - addCriterion("EstablishDate between", value1, value2, "establishdate"); - return (Criteria) this; - } - - public Criteria andEstablishdateNotBetween(Date value1, Date value2) { - addCriterion("EstablishDate not between", value1, value2, "establishdate"); - return (Criteria) this; - } - - public Criteria andRisklevelIsNull() { - addCriterion("RiskLevel is null"); - return (Criteria) this; - } - - public Criteria andRisklevelIsNotNull() { - addCriterion("RiskLevel is not null"); - return (Criteria) this; - } - - public Criteria andRisklevelEqualTo(String value) { - addCriterion("RiskLevel =", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelNotEqualTo(String value) { - addCriterion("RiskLevel <>", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelGreaterThan(String value) { - addCriterion("RiskLevel >", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelGreaterThanOrEqualTo(String value) { - addCriterion("RiskLevel >=", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelLessThan(String value) { - addCriterion("RiskLevel <", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelLessThanOrEqualTo(String value) { - addCriterion("RiskLevel <=", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelLike(String value) { - addCriterion("RiskLevel like", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelNotLike(String value) { - addCriterion("RiskLevel not like", value, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelIn(List values) { - addCriterion("RiskLevel in", values, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelNotIn(List values) { - addCriterion("RiskLevel not in", values, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelBetween(String value1, String value2) { - addCriterion("RiskLevel between", value1, value2, "risklevel"); - return (Criteria) this; - } - - public Criteria andRisklevelNotBetween(String value1, String value2) { - addCriterion("RiskLevel not between", value1, value2, "risklevel"); - return (Criteria) this; - } - - public Criteria andLatitudeIsNull() { - addCriterion("Latitude is null"); - return (Criteria) this; - } - - public Criteria andLatitudeIsNotNull() { - addCriterion("Latitude is not null"); - return (Criteria) this; - } - - public Criteria andLatitudeEqualTo(String value) { - addCriterion("Latitude =", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeNotEqualTo(String value) { - addCriterion("Latitude <>", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeGreaterThan(String value) { - addCriterion("Latitude >", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeGreaterThanOrEqualTo(String value) { - addCriterion("Latitude >=", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeLessThan(String value) { - addCriterion("Latitude <", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeLessThanOrEqualTo(String value) { - addCriterion("Latitude <=", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeLike(String value) { - addCriterion("Latitude like", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeNotLike(String value) { - addCriterion("Latitude not like", value, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeIn(List values) { - addCriterion("Latitude in", values, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeNotIn(List values) { - addCriterion("Latitude not in", values, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeBetween(String value1, String value2) { - addCriterion("Latitude between", value1, value2, "latitude"); - return (Criteria) this; - } - - public Criteria andLatitudeNotBetween(String value1, String value2) { - addCriterion("Latitude not between", value1, value2, "latitude"); - return (Criteria) this; - } - - public Criteria andLongitudeIsNull() { - addCriterion("Longitude is null"); - return (Criteria) this; - } - - public Criteria andLongitudeIsNotNull() { - addCriterion("Longitude is not null"); - return (Criteria) this; - } - - public Criteria andLongitudeEqualTo(String value) { - addCriterion("Longitude =", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeNotEqualTo(String value) { - addCriterion("Longitude <>", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeGreaterThan(String value) { - addCriterion("Longitude >", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeGreaterThanOrEqualTo(String value) { - addCriterion("Longitude >=", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeLessThan(String value) { - addCriterion("Longitude <", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeLessThanOrEqualTo(String value) { - addCriterion("Longitude <=", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeLike(String value) { - addCriterion("Longitude like", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeNotLike(String value) { - addCriterion("Longitude not like", value, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeIn(List values) { - addCriterion("Longitude in", values, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeNotIn(List values) { - addCriterion("Longitude not in", values, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeBetween(String value1, String value2) { - addCriterion("Longitude between", value1, value2, "longitude"); - return (Criteria) this; - } - - public Criteria andLongitudeNotBetween(String value1, String value2) { - addCriterion("Longitude not between", value1, value2, "longitude"); - return (Criteria) this; - } - - public Criteria andIsblacklistIsNull() { - addCriterion("IsBlackList is null"); - return (Criteria) this; - } - - public Criteria andIsblacklistIsNotNull() { - addCriterion("IsBlackList is not null"); - return (Criteria) this; - } - - public Criteria andIsblacklistEqualTo(String value) { - addCriterion("IsBlackList =", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistNotEqualTo(String value) { - addCriterion("IsBlackList <>", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistGreaterThan(String value) { - addCriterion("IsBlackList >", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistGreaterThanOrEqualTo(String value) { - addCriterion("IsBlackList >=", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistLessThan(String value) { - addCriterion("IsBlackList <", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistLessThanOrEqualTo(String value) { - addCriterion("IsBlackList <=", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistLike(String value) { - addCriterion("IsBlackList like", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistNotLike(String value) { - addCriterion("IsBlackList not like", value, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistIn(List values) { - addCriterion("IsBlackList in", values, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistNotIn(List values) { - addCriterion("IsBlackList not in", values, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistBetween(String value1, String value2) { - addCriterion("IsBlackList between", value1, value2, "isblacklist"); - return (Criteria) this; - } - - public Criteria andIsblacklistNotBetween(String value1, String value2) { - addCriterion("IsBlackList not between", value1, value2, "isblacklist"); - return (Criteria) this; - } - - public Criteria andCommentsIsNull() { - addCriterion("Comments is null"); - return (Criteria) this; - } - - public Criteria andCommentsIsNotNull() { - addCriterion("Comments is not null"); - return (Criteria) this; - } - - public Criteria andCommentsEqualTo(String value) { - addCriterion("Comments =", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsNotEqualTo(String value) { - addCriterion("Comments <>", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsGreaterThan(String value) { - addCriterion("Comments >", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsGreaterThanOrEqualTo(String value) { - addCriterion("Comments >=", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsLessThan(String value) { - addCriterion("Comments <", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsLessThanOrEqualTo(String value) { - addCriterion("Comments <=", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsLike(String value) { - addCriterion("Comments like", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsNotLike(String value) { - addCriterion("Comments not like", value, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsIn(List values) { - addCriterion("Comments in", values, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsNotIn(List values) { - addCriterion("Comments not in", values, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsBetween(String value1, String value2) { - addCriterion("Comments between", value1, value2, "comments"); - return (Criteria) this; - } - - public Criteria andCommentsNotBetween(String value1, String value2) { - addCriterion("Comments not between", value1, value2, "comments"); - return (Criteria) this; - } - - public Criteria andIsmalecodeIsNull() { - addCriterion("ISMaleCode is null"); - return (Criteria) this; - } - - public Criteria andIsmalecodeIsNotNull() { - addCriterion("ISMaleCode is not null"); - return (Criteria) this; - } - - public Criteria andIsmalecodeEqualTo(String value) { - addCriterion("ISMaleCode =", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeNotEqualTo(String value) { - addCriterion("ISMaleCode <>", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeGreaterThan(String value) { - addCriterion("ISMaleCode >", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeGreaterThanOrEqualTo(String value) { - addCriterion("ISMaleCode >=", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeLessThan(String value) { - addCriterion("ISMaleCode <", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeLessThanOrEqualTo(String value) { - addCriterion("ISMaleCode <=", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeLike(String value) { - addCriterion("ISMaleCode like", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeNotLike(String value) { - addCriterion("ISMaleCode not like", value, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeIn(List values) { - addCriterion("ISMaleCode in", values, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeNotIn(List values) { - addCriterion("ISMaleCode not in", values, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeBetween(String value1, String value2) { - addCriterion("ISMaleCode between", value1, value2, "ismalecode"); - return (Criteria) this; - } - - public Criteria andIsmalecodeNotBetween(String value1, String value2) { - addCriterion("ISMaleCode not between", value1, value2, "ismalecode"); - return (Criteria) this; - } - - public Criteria andEntscoreIsNull() { - addCriterion("EntScore is null"); - return (Criteria) this; - } - - public Criteria andEntscoreIsNotNull() { - addCriterion("EntScore is not null"); - return (Criteria) this; - } - - public Criteria andEntscoreEqualTo(String value) { - addCriterion("EntScore =", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreNotEqualTo(String value) { - addCriterion("EntScore <>", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreGreaterThan(String value) { - addCriterion("EntScore >", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreGreaterThanOrEqualTo(String value) { - addCriterion("EntScore >=", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreLessThan(String value) { - addCriterion("EntScore <", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreLessThanOrEqualTo(String value) { - addCriterion("EntScore <=", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreLike(String value) { - addCriterion("EntScore like", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreNotLike(String value) { - addCriterion("EntScore not like", value, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreIn(List values) { - addCriterion("EntScore in", values, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreNotIn(List values) { - addCriterion("EntScore not in", values, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreBetween(String value1, String value2) { - addCriterion("EntScore between", value1, value2, "entscore"); - return (Criteria) this; - } - - public Criteria andEntscoreNotBetween(String value1, String value2) { - addCriterion("EntScore not between", value1, value2, "entscore"); - return (Criteria) this; - } - - public Criteria andEnthousenumIsNull() { - addCriterion("EntHouseNum is null"); - return (Criteria) this; - } - - public Criteria andEnthousenumIsNotNull() { - addCriterion("EntHouseNum is not null"); - return (Criteria) this; - } - - public Criteria andEnthousenumEqualTo(String value) { - addCriterion("EntHouseNum =", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumNotEqualTo(String value) { - addCriterion("EntHouseNum <>", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumGreaterThan(String value) { - addCriterion("EntHouseNum >", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumGreaterThanOrEqualTo(String value) { - addCriterion("EntHouseNum >=", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumLessThan(String value) { - addCriterion("EntHouseNum <", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumLessThanOrEqualTo(String value) { - addCriterion("EntHouseNum <=", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumLike(String value) { - addCriterion("EntHouseNum like", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumNotLike(String value) { - addCriterion("EntHouseNum not like", value, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumIn(List values) { - addCriterion("EntHouseNum in", values, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumNotIn(List values) { - addCriterion("EntHouseNum not in", values, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumBetween(String value1, String value2) { - addCriterion("EntHouseNum between", value1, value2, "enthousenum"); - return (Criteria) this; - } - - public Criteria andEnthousenumNotBetween(String value1, String value2) { - addCriterion("EntHouseNum not between", value1, value2, "enthousenum"); - return (Criteria) this; - } - - public Criteria andCreatedonIsNull() { - addCriterion("CreatedOn is null"); - return (Criteria) this; - } - - public Criteria andCreatedonIsNotNull() { - addCriterion("CreatedOn is not null"); - return (Criteria) this; - } - - public Criteria andCreatedonEqualTo(Date value) { - addCriterion("CreatedOn =", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonNotEqualTo(Date value) { - addCriterion("CreatedOn <>", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonGreaterThan(Date value) { - addCriterion("CreatedOn >", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonGreaterThanOrEqualTo(Date value) { - addCriterion("CreatedOn >=", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonLessThan(Date value) { - addCriterion("CreatedOn <", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonLessThanOrEqualTo(Date value) { - addCriterion("CreatedOn <=", value, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonIn(List values) { - addCriterion("CreatedOn in", values, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonNotIn(List values) { - addCriterion("CreatedOn not in", values, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonBetween(Date value1, Date value2) { - addCriterion("CreatedOn between", value1, value2, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedonNotBetween(Date value1, Date value2) { - addCriterion("CreatedOn not between", value1, value2, "createdon"); - return (Criteria) this; - } - - public Criteria andCreatedbyIsNull() { - addCriterion("CreatedBy is null"); - return (Criteria) this; - } - - public Criteria andCreatedbyIsNotNull() { - addCriterion("CreatedBy is not null"); - return (Criteria) this; - } - - public Criteria andCreatedbyEqualTo(String value) { - addCriterion("CreatedBy =", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyNotEqualTo(String value) { - addCriterion("CreatedBy <>", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyGreaterThan(String value) { - addCriterion("CreatedBy >", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyGreaterThanOrEqualTo(String value) { - addCriterion("CreatedBy >=", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyLessThan(String value) { - addCriterion("CreatedBy <", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyLessThanOrEqualTo(String value) { - addCriterion("CreatedBy <=", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyLike(String value) { - addCriterion("CreatedBy like", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyNotLike(String value) { - addCriterion("CreatedBy not like", value, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyIn(List values) { - addCriterion("CreatedBy in", values, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyNotIn(List values) { - addCriterion("CreatedBy not in", values, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyBetween(String value1, String value2) { - addCriterion("CreatedBy between", value1, value2, "createdby"); - return (Criteria) this; - } - - public Criteria andCreatedbyNotBetween(String value1, String value2) { - addCriterion("CreatedBy not between", value1, value2, "createdby"); - return (Criteria) this; - } - - public Criteria andModifiedonIsNull() { - addCriterion("ModifiedOn is null"); - return (Criteria) this; - } - - public Criteria andModifiedonIsNotNull() { - addCriterion("ModifiedOn is not null"); - return (Criteria) this; - } - - public Criteria andModifiedonEqualTo(Date value) { - addCriterion("ModifiedOn =", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonNotEqualTo(Date value) { - addCriterion("ModifiedOn <>", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonGreaterThan(Date value) { - addCriterion("ModifiedOn >", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonGreaterThanOrEqualTo(Date value) { - addCriterion("ModifiedOn >=", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonLessThan(Date value) { - addCriterion("ModifiedOn <", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonLessThanOrEqualTo(Date value) { - addCriterion("ModifiedOn <=", value, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonIn(List values) { - addCriterion("ModifiedOn in", values, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonNotIn(List values) { - addCriterion("ModifiedOn not in", values, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonBetween(Date value1, Date value2) { - addCriterion("ModifiedOn between", value1, value2, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedonNotBetween(Date value1, Date value2) { - addCriterion("ModifiedOn not between", value1, value2, "modifiedon"); - return (Criteria) this; - } - - public Criteria andModifiedbyIsNull() { - addCriterion("ModifiedBy is null"); - return (Criteria) this; - } - - public Criteria andModifiedbyIsNotNull() { - addCriterion("ModifiedBy is not null"); - return (Criteria) this; - } - - public Criteria andModifiedbyEqualTo(String value) { - addCriterion("ModifiedBy =", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyNotEqualTo(String value) { - addCriterion("ModifiedBy <>", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyGreaterThan(String value) { - addCriterion("ModifiedBy >", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyGreaterThanOrEqualTo(String value) { - addCriterion("ModifiedBy >=", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyLessThan(String value) { - addCriterion("ModifiedBy <", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyLessThanOrEqualTo(String value) { - addCriterion("ModifiedBy <=", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyLike(String value) { - addCriterion("ModifiedBy like", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyNotLike(String value) { - addCriterion("ModifiedBy not like", value, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyIn(List values) { - addCriterion("ModifiedBy in", values, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyNotIn(List values) { - addCriterion("ModifiedBy not in", values, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyBetween(String value1, String value2) { - addCriterion("ModifiedBy between", value1, value2, "modifiedby"); - return (Criteria) this; - } - - public Criteria andModifiedbyNotBetween(String value1, String value2) { - addCriterion("ModifiedBy not between", value1, value2, "modifiedby"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} diff --git a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml b/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml index 0b6c5e0..abe1ea5 100644 --- a/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml +++ b/inventory-dao/src/main/resources/mapper/SysOrgMapper.xml @@ -316,6 +316,11 @@ SELECT * FROM SysOrg so + + + @@ -337,6 +342,7 @@ FROM SysOrg so LEFT JOIN SysOrg sp ON so.`SuperiorOrgCode` = sp.`OrgCode` WHERE so.`OrgName` LIKE #{condition} + and FIND_IN_SET(#{userArea},so.parent_path) and so.`SuperiorOrgCode` = #{orgcode} @@ -714,4 +720,10 @@ and se.State = '启用' order by so.OrgCode ASC + + + diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml index 893efee..bda5d71 100644 --- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml @@ -57,64 +57,7 @@ - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - + SysEnterpriseId, OrgCode, street_code,community_code,SuperiorEnterpriseId, LowOrgCode, EntName, @@ -136,28 +79,7 @@ RiskLevel, Latitude, Longitude, IsBlackList, Comments, ISMaleCode, EntScore, EntHouseNum, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy,qr_code - + - select count(*) from SysEnterprise - - - - - - update SysEnterprise - - - SysEnterpriseId = #{record.sysenterpriseid,jdbcType=VARCHAR}, - - - OrgCode = #{record.orgcode,jdbcType=VARCHAR}, - - - SuperiorEnterpriseId = #{record.superiorenterpriseid,jdbcType=VARCHAR}, - - - LowOrgCode = #{record.loworgcode,jdbcType=VARCHAR}, - - - EntName = #{record.entname,jdbcType=VARCHAR}, - - - IsHide = #{record.isHide,jdbcType=VARCHAR}, - - - State = #{record.state,jdbcType=VARCHAR}, - - - complite = #{record.complite,jdbcType=VARCHAR}, - - - sysUnitId = #{record.sysUnitId,jdbcType=VARCHAR}, - - - ManagerDept = #{record.managerDept,jdbcType=VARCHAR}, - - - dynamicRiskLevel = #{record.dynamicRiskLevel,jdbcType=VARCHAR}, - - - inherentRisk = #{record.inherentRisk,jdbcType=VARCHAR}, - - - manageType = #{record.manageType,jdbcType=VARCHAR}, - - - EntType = #{record.enttype,jdbcType=VARCHAR}, - - - EntSection = #{record.entsection,jdbcType=VARCHAR}, - - - BaseSafeClassId = #{record.basesafeclassid,jdbcType=VARCHAR}, - - - BaseInClassId = #{record.baseinclassid,jdbcType=VARCHAR}, - - - work_class_id = #{record.workClassId,jdbcType=VARCHAR}, - - - PinYin = #{record.pinyin,jdbcType=VARCHAR}, - - - Principal = #{record.principal,jdbcType=VARCHAR}, - - - SysAddress = #{record.sysaddress,jdbcType=VARCHAR}, - - - safeTelephone = #{record.safeTelephone,jdbcType=VARCHAR}, - - - safeManager = #{record.safeManager,jdbcType=VARCHAR}, - - - PostCode = #{record.postcode,jdbcType=VARCHAR}, - - - EcoType = #{record.ecotype,jdbcType=VARCHAR}, - - - PersonCount = #{record.personcount,jdbcType=INTEGER}, - - - EntLogoPic = #{record.entlogopic,jdbcType=VARCHAR}, - - - MaleCode = #{record.malecode,jdbcType=VARCHAR}, - - - OrgPassNo = #{record.orgpassno,jdbcType=VARCHAR}, - - - LegalRepre = #{record.legalrepre,jdbcType=VARCHAR}, - - - LRIDCard = #{record.lridcard,jdbcType=VARCHAR}, - - - LRLinkTel = #{record.lrlinktel,jdbcType=VARCHAR}, - - - EstablishDate = #{record.establishdate,jdbcType=TIMESTAMP}, - - - RiskLevel = #{record.risklevel,jdbcType=VARCHAR}, - - - Latitude = #{record.latitude,jdbcType=VARCHAR}, - - - Longitude = #{record.longitude,jdbcType=VARCHAR}, - - - IsBlackList = #{record.isblacklist,jdbcType=VARCHAR}, - - - Comments = #{record.comments,jdbcType=VARCHAR}, - - - ISMaleCode = #{record.ismalecode,jdbcType=VARCHAR}, - - - EntScore = #{record.entscore,jdbcType=VARCHAR}, - - - EntHouseNum = #{record.enthousenum,jdbcType=VARCHAR}, - - - CreatedOn = #{record.createdon,jdbcType=TIMESTAMP}, - - - CreatedBy = #{record.createdby,jdbcType=VARCHAR}, - - - ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP}, - - - ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR}, - - - - - - - - update SysEnterprise - set SysEnterpriseId = #{record.sysenterpriseid,jdbcType=VARCHAR}, - OrgCode = #{record.orgcode,jdbcType=VARCHAR}, - SuperiorEnterpriseId = #{record.superiorenterpriseid,jdbcType=VARCHAR}, - LowOrgCode = #{record.loworgcode,jdbcType=VARCHAR}, - EntName = #{record.entname,jdbcType=VARCHAR}, - IsHide = #{record.isHide,jdbcType=VARCHAR}, - State = #{record.state,jdbcType=VARCHAR}, - complite = #{record.complite,jdbcType=VARCHAR}, - sysUnitId = #{record.sysUnitId,jdbcType=VARCHAR}, - ManagerDept = #{record.managerDept,jdbcType=VARCHAR}, - dynamicRiskLevel = #{record.dynamicRiskLevel,jdbcType=VARCHAR}, - inherentRisk = #{record.inherentRisk,jdbcType=VARCHAR}, - manageType = #{record.manageType,jdbcType=VARCHAR}, - EntType = #{record.enttype,jdbcType=VARCHAR}, - EntSection = #{record.entsection,jdbcType=VARCHAR}, - BaseSafeClassId = #{record.basesafeclassid,jdbcType=VARCHAR}, - BaseInClassId = #{record.baseinclassid,jdbcType=VARCHAR}, - work_class_id = #{record.workClassId,jdbcType=VARCHAR}, - PinYin = #{record.pinyin,jdbcType=VARCHAR}, - Principal = #{record.principal,jdbcType=VARCHAR}, - SysAddress = #{record.sysaddress,jdbcType=VARCHAR}, - safeTelephone = #{record.safeTelephone,jdbcType=VARCHAR}, - safeManager = #{record.safeManager,jdbcType=VARCHAR}, - PostCode = #{record.postcode,jdbcType=VARCHAR}, - EcoType = #{record.ecotype,jdbcType=VARCHAR}, - PersonCount = #{record.personcount,jdbcType=INTEGER}, - EntLogoPic = #{record.entlogopic,jdbcType=VARCHAR}, - MaleCode = #{record.malecode,jdbcType=VARCHAR}, - OrgPassNo = #{record.orgpassno,jdbcType=VARCHAR}, - LegalRepre = #{record.legalrepre,jdbcType=VARCHAR}, - LRIDCard = #{record.lridcard,jdbcType=VARCHAR}, - LRLinkTel = #{record.lrlinktel,jdbcType=VARCHAR}, - EstablishDate = #{record.establishdate,jdbcType=TIMESTAMP}, - RiskLevel = #{record.risklevel,jdbcType=VARCHAR}, - Latitude = #{record.latitude,jdbcType=VARCHAR}, - Longitude = #{record.longitude,jdbcType=VARCHAR}, - IsBlackList = #{record.isblacklist,jdbcType=VARCHAR}, - Comments = #{record.comments,jdbcType=VARCHAR}, - ISMaleCode = #{record.ismalecode,jdbcType=VARCHAR}, - EntScore = #{record.entscore,jdbcType=VARCHAR}, - EntHouseNum = #{record.enthousenum,jdbcType=VARCHAR}, - CreatedOn = #{record.createdon,jdbcType=TIMESTAMP}, - CreatedBy = #{record.createdby,jdbcType=VARCHAR}, - ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP}, - ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR} - - - - + update SysEnterprise @@ -1249,9 +967,9 @@ - - - + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index 4753f90..de11482 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -591,4 +591,52 @@ public class DataController extends com.rzyc.controller.BaseController { return result; } + /** + * 地区处理 + * @version v1.0 + * @author dong + * @date 2022/10/28 10:49 + */ + @ApiOperation(value = "地区处理", notes = "地区处理") + @RequestMapping(value = "/orgData", method = RequestMethod.GET) + @ResponseBody + public SingleResult orgData(Integer level)throws Exception{ + SingleResult result = new SingleResult<>(); + List sysOrgs = sysOrgMapper.findByLevel(level); + for (SysOrg sysOrg : sysOrgs){ + changePath(sysOrg.getOrgcode()); + } + return result; + } + + /** + * 处理地区信息 + * @version v1.0 + * @author dong + * @date 2022/10/28 11:01 + */ + private void changePath(String orgCode)throws Exception{ + SysOrg sysOrg = sysOrgMapper.selectById(orgCode); + if(null != sysOrg){ + if(StringUtils.isNotBlank(sysOrg.getSuperiororgcode())){ + SysOrg superOrg = sysOrgMapper.selectById(sysOrg.getSuperiororgcode()); + if(null != superOrg){ + sysOrg.setParentName(superOrg.getParentName()+","+sysOrg.getOrgname()); + sysOrg.setParentPath(superOrg.getParentPath()+","+sysOrg.getOrgcode()); + } + }else{ + sysOrg.setParentName(sysOrg.getOrgname()); + sysOrg.setParentPath(sysOrg.getOrgcode()); + } + + SysOrg org = new SysOrg(); + org.setOrgcode(sysOrg.getOrgcode()); + org.setParentName(sysOrg.getParentName()); + org.setParentPath(sysOrg.getParentPath()); + sysOrgMapper.updateById(org); + + } + + } + } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java b/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java index 8ed9526..c616212 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/OtherController.java @@ -499,23 +499,21 @@ public class OtherController extends BaseController{ @ResponseBody public MultiResult areaTree(String userId)throws Exception{ System.out.println("userId -> "+userId); + MultiResult result = new MultiResult<>(); - List sysOrgs = new ArrayList<>(); - - if(StringUtils.isNotBlank(userId)){ - SysUser sysUser = sysUserMapper.findById(userId); - if(null != sysUser){ - if(StringUtils.isBlank(sysUser.getStreetCode()) && StringUtils.isBlank(sysUser.getCommunityCode())){ - sysOrgs = sysOrgMapper.findAll(); - } - }else{ - sysOrgs = sysOrgMapper.findAll(); - } - }else{ - sysOrgs = sysOrgMapper.findAll(); + //获取用户低 + if(StringUtils.isBlank(userId)){ + userId = getUserId(); } + //获取用户的地区id + String userArea = getUserArea(userId); + if(StringUtils.isBlank(userArea)){ + userArea = constantsConfigure.getSuperiorOrgCode(); + } + + List sysOrgs = sysOrgMapper.findUserArea(userArea); if(sysOrgs.size() > 0){ 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 1c6ab68..6120523 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/SettingController.java @@ -836,9 +836,11 @@ public class SettingController extends BaseController{ public SingleResult> areaPage(@Valid AreaPageDto areaPageDto)throws Exception{ SingleResult> result = new SingleResult<>(); String condition = TypeConversion.getCondition(areaPageDto.getCondition()); + String userId = getUserId(); + String userArea = getUserArea(userId); //分页 PageHelper.startPage(areaPageDto.getPage(), areaPageDto.getPageSize()); - Page page = (Page)sysOrgMapper.areaPage(condition,areaPageDto.getOrgcode()); + Page page = (Page)sysOrgMapper.areaPage(condition,areaPageDto.getOrgcode(),userArea); Pager pager = new Pager<>(); getDatePage(pager,page); result.setData(pager);