diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserMapper.java deleted file mode 100644 index 887fa78..0000000 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.rzyc.mapper.ent; - -import com.rzyc.model.ent.EntUser; -import com.rzyc.model.ent.EntUserExample; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface EntUserMapper { - long countByExample(EntUserExample example); - - int deleteByExample(EntUserExample example); - - int insert(EntUser record); - - int insertSelective(EntUser record); - - List selectByExample(EntUserExample example); - - int updateByExampleSelective(@Param("record") EntUser record, @Param("example") EntUserExample example); - - int updateByExample(@Param("record") EntUser record, @Param("example") EntUserExample example); -} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java deleted file mode 100644 index c414aae..0000000 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.rzyc.model.ent; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author - */ -public class EntUser implements Serializable { - /** - * 企业用户关联 - */ - private String entUserId; - - /** - * 用户id - */ - private String userId; - - /** - * 企业id - */ - private String entId; - - private String modified; - - private String created; - - private Date modifyTime; - - private Date createTime; - - private static final long serialVersionUID = 1L; - - public String getEntUserId() { - return entUserId; - } - - public void setEntUserId(String entUserId) { - this.entUserId = entUserId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getEntId() { - return entId; - } - - public void setEntId(String entId) { - this.entId = entId; - } - - public String getModified() { - return modified; - } - - public void setModified(String modified) { - this.modified = modified; - } - - public String getCreated() { - return created; - } - - public void setCreated(String created) { - this.created = created; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - EntUser other = (EntUser) that; - return (this.getEntUserId() == null ? other.getEntUserId() == null : this.getEntUserId().equals(other.getEntUserId())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getEntId() == null ? other.getEntId() == null : this.getEntId().equals(other.getEntId())) - && (this.getModified() == null ? other.getModified() == null : this.getModified().equals(other.getModified())) - && (this.getCreated() == null ? other.getCreated() == null : this.getCreated().equals(other.getCreated())) - && (this.getModifyTime() == null ? other.getModifyTime() == null : this.getModifyTime().equals(other.getModifyTime())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getEntUserId() == null) ? 0 : getEntUserId().hashCode()); - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getEntId() == null) ? 0 : getEntId().hashCode()); - result = prime * result + ((getModified() == null) ? 0 : getModified().hashCode()); - result = prime * result + ((getCreated() == null) ? 0 : getCreated().hashCode()); - result = prime * result + ((getModifyTime() == null) ? 0 : getModifyTime().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", entUserId=").append(entUserId); - sb.append(", userId=").append(userId); - sb.append(", entId=").append(entId); - sb.append(", modified=").append(modified); - sb.append(", created=").append(created); - sb.append(", modifyTime=").append(modifyTime); - sb.append(", createTime=").append(createTime); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserExample.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserExample.java deleted file mode 100644 index 08b3be3..0000000 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUserExample.java +++ /dev/null @@ -1,693 +0,0 @@ -package com.rzyc.model.ent; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class EntUserExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public EntUserExample() { - 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 andEntUserIdIsNull() { - addCriterion("ent_user_id is null"); - return (Criteria) this; - } - - public Criteria andEntUserIdIsNotNull() { - addCriterion("ent_user_id is not null"); - return (Criteria) this; - } - - public Criteria andEntUserIdEqualTo(String value) { - addCriterion("ent_user_id =", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdNotEqualTo(String value) { - addCriterion("ent_user_id <>", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdGreaterThan(String value) { - addCriterion("ent_user_id >", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdGreaterThanOrEqualTo(String value) { - addCriterion("ent_user_id >=", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdLessThan(String value) { - addCriterion("ent_user_id <", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdLessThanOrEqualTo(String value) { - addCriterion("ent_user_id <=", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdLike(String value) { - addCriterion("ent_user_id like", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdNotLike(String value) { - addCriterion("ent_user_id not like", value, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdIn(List values) { - addCriterion("ent_user_id in", values, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdNotIn(List values) { - addCriterion("ent_user_id not in", values, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdBetween(String value1, String value2) { - addCriterion("ent_user_id between", value1, value2, "entUserId"); - return (Criteria) this; - } - - public Criteria andEntUserIdNotBetween(String value1, String value2) { - addCriterion("ent_user_id not between", value1, value2, "entUserId"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(String value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(String value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(String value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(String value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(String value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(String value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLike(String value) { - addCriterion("user_id like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotLike(String value) { - addCriterion("user_id not like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(String value1, String value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(String value1, String value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andEntIdIsNull() { - addCriterion("ent_id is null"); - return (Criteria) this; - } - - public Criteria andEntIdIsNotNull() { - addCriterion("ent_id is not null"); - return (Criteria) this; - } - - public Criteria andEntIdEqualTo(String value) { - addCriterion("ent_id =", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdNotEqualTo(String value) { - addCriterion("ent_id <>", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdGreaterThan(String value) { - addCriterion("ent_id >", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdGreaterThanOrEqualTo(String value) { - addCriterion("ent_id >=", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdLessThan(String value) { - addCriterion("ent_id <", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdLessThanOrEqualTo(String value) { - addCriterion("ent_id <=", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdLike(String value) { - addCriterion("ent_id like", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdNotLike(String value) { - addCriterion("ent_id not like", value, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdIn(List values) { - addCriterion("ent_id in", values, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdNotIn(List values) { - addCriterion("ent_id not in", values, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdBetween(String value1, String value2) { - addCriterion("ent_id between", value1, value2, "entId"); - return (Criteria) this; - } - - public Criteria andEntIdNotBetween(String value1, String value2) { - addCriterion("ent_id not between", value1, value2, "entId"); - return (Criteria) this; - } - - public Criteria andModifiedIsNull() { - addCriterion("modified is null"); - return (Criteria) this; - } - - public Criteria andModifiedIsNotNull() { - addCriterion("modified is not null"); - return (Criteria) this; - } - - public Criteria andModifiedEqualTo(String value) { - addCriterion("modified =", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedNotEqualTo(String value) { - addCriterion("modified <>", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedGreaterThan(String value) { - addCriterion("modified >", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedGreaterThanOrEqualTo(String value) { - addCriterion("modified >=", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedLessThan(String value) { - addCriterion("modified <", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedLessThanOrEqualTo(String value) { - addCriterion("modified <=", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedLike(String value) { - addCriterion("modified like", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedNotLike(String value) { - addCriterion("modified not like", value, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedIn(List values) { - addCriterion("modified in", values, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedNotIn(List values) { - addCriterion("modified not in", values, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedBetween(String value1, String value2) { - addCriterion("modified between", value1, value2, "modified"); - return (Criteria) this; - } - - public Criteria andModifiedNotBetween(String value1, String value2) { - addCriterion("modified not between", value1, value2, "modified"); - return (Criteria) this; - } - - public Criteria andCreatedIsNull() { - addCriterion("created is null"); - return (Criteria) this; - } - - public Criteria andCreatedIsNotNull() { - addCriterion("created is not null"); - return (Criteria) this; - } - - public Criteria andCreatedEqualTo(String value) { - addCriterion("created =", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedNotEqualTo(String value) { - addCriterion("created <>", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedGreaterThan(String value) { - addCriterion("created >", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedGreaterThanOrEqualTo(String value) { - addCriterion("created >=", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedLessThan(String value) { - addCriterion("created <", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedLessThanOrEqualTo(String value) { - addCriterion("created <=", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedLike(String value) { - addCriterion("created like", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedNotLike(String value) { - addCriterion("created not like", value, "created"); - return (Criteria) this; - } - - public Criteria andCreatedIn(List values) { - addCriterion("created in", values, "created"); - return (Criteria) this; - } - - public Criteria andCreatedNotIn(List values) { - addCriterion("created not in", values, "created"); - return (Criteria) this; - } - - public Criteria andCreatedBetween(String value1, String value2) { - addCriterion("created between", value1, value2, "created"); - return (Criteria) this; - } - - public Criteria andCreatedNotBetween(String value1, String value2) { - addCriterion("created not between", value1, value2, "created"); - return (Criteria) this; - } - - public Criteria andModifyTimeIsNull() { - addCriterion("modify_time is null"); - return (Criteria) this; - } - - public Criteria andModifyTimeIsNotNull() { - addCriterion("modify_time is not null"); - return (Criteria) this; - } - - public Criteria andModifyTimeEqualTo(Date value) { - addCriterion("modify_time =", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeNotEqualTo(Date value) { - addCriterion("modify_time <>", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeGreaterThan(Date value) { - addCriterion("modify_time >", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) { - addCriterion("modify_time >=", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeLessThan(Date value) { - addCriterion("modify_time <", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeLessThanOrEqualTo(Date value) { - addCriterion("modify_time <=", value, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeIn(List values) { - addCriterion("modify_time in", values, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeNotIn(List values) { - addCriterion("modify_time not in", values, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeBetween(Date value1, Date value2) { - addCriterion("modify_time between", value1, value2, "modifyTime"); - return (Criteria) this; - } - - public Criteria andModifyTimeNotBetween(Date value1, Date value2) { - addCriterion("modify_time not between", value1, value2, "modifyTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - 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/java/com/rzyc/model/ent/InEntList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java index 68dacea..b4829ef 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java @@ -70,6 +70,10 @@ public class InEntList implements Serializable { @TableField("sort_id") private Integer sortId; + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java index 896e824..67e4caf 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java @@ -34,6 +34,10 @@ public class InList implements Serializable { @TableField("sort_id") private Integer sortId; + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java index 5f74bea..50faaab 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java @@ -66,6 +66,10 @@ public class InListItem implements Serializable { @TableField("sort_id") private Integer sortId; + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; diff --git a/inventory-dao/src/main/resources/mapper/ent/EntUserMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntUserMapper.xml deleted file mode 100644 index 332308e..0000000 --- a/inventory-dao/src/main/resources/mapper/ent/EntUserMapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 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} - - - - - - - - - - - ent_user_id, user_id, ent_id, modified, created, modify_time, create_time - - - - delete from ent_user - - - - - - insert into ent_user (ent_user_id, user_id, ent_id, - modified, created, modify_time, - create_time) - values (#{entUserId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{entId,jdbcType=VARCHAR}, - #{modified,jdbcType=VARCHAR}, #{created,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, - #{createTime,jdbcType=TIMESTAMP}) - - - insert into ent_user - - - ent_user_id, - - - user_id, - - - ent_id, - - - modified, - - - created, - - - modify_time, - - - create_time, - - - - - #{entUserId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{entId,jdbcType=VARCHAR}, - - - #{modified,jdbcType=VARCHAR}, - - - #{created,jdbcType=VARCHAR}, - - - #{modifyTime,jdbcType=TIMESTAMP}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - update ent_user - - - ent_user_id = #{record.entUserId,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - ent_id = #{record.entId,jdbcType=VARCHAR}, - - - modified = #{record.modified,jdbcType=VARCHAR}, - - - created = #{record.created,jdbcType=VARCHAR}, - - - modify_time = #{record.modifyTime,jdbcType=TIMESTAMP}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - update ent_user - set ent_user_id = #{record.entUserId,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - ent_id = #{record.entId,jdbcType=VARCHAR}, - modified = #{record.modified,jdbcType=VARCHAR}, - created = #{record.created,jdbcType=VARCHAR}, - modify_time = #{record.modifyTime,jdbcType=TIMESTAMP}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - diff --git a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml index 57df20f..c9c3e9f 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml @@ -16,6 +16,7 @@ + @@ -24,7 +25,8 @@ - ent_list_id, item_id, list_id, enterprise_id, item_content, standard, frequency, enclosure, item_basis, item_proof, item_law, sort_id, create_time, create_by, modify_time, modify_by + ent_list_id, item_id, list_id, enterprise_id, item_content, standard, frequency, enclosure, + item_basis, item_proof, item_law, sort_id,del_state, create_time, create_by, modify_time, modify_by diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml index 32f2880..a29ca1b 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml @@ -15,6 +15,7 @@ + @@ -23,7 +24,8 @@ - item_id, list_id, industry_id, item_content, standard, frequency, enclosure, item_basis, item_proof, item_law, sort_id, create_time, create_by, modify_time, modify_by + item_id, list_id, industry_id, item_content, standard, frequency, enclosure, +item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, modify_time, modify_by diff --git a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml index 3f6e8bb..7816524 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - list_id, name, sort_id, create_time, create_by, modify_time, modify_by + list_id, name, sort_id,del_state, create_time, create_by, modify_time, modify_by diff --git a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java index 0dbdc45..3b95bed 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java @@ -268,7 +268,7 @@ public class BaseController { @Autowired protected SysRoleResourceMapper sysRoleResourceMapper; - //浏览器对象 + //请求对象 @Autowired protected HttpServletRequest request; @@ -336,10 +336,6 @@ public class BaseController { @Autowired protected IndustryWorkMapper industryWorkMapper; - //企业监管用户 - @Autowired - protected EntUserMapper entUserMapper; - //责任树 @Autowired protected DutyTreeMapper dutyTreeMapper; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index eeb944d..f00005a 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -268,7 +268,7 @@ public class BaseController { @Autowired protected SysRoleResourceMapper sysRoleResourceMapper; - //浏览器对象 + //请求对象 @Autowired protected HttpServletRequest request; @@ -336,10 +336,6 @@ public class BaseController { @Autowired protected IndustryWorkMapper industryWorkMapper; - //企业监管用户 - @Autowired - protected EntUserMapper entUserMapper; - //责任树 @Autowired protected DutyTreeMapper dutyTreeMapper; @@ -2568,24 +2564,12 @@ public class BaseController { //接收人列表 List distributions = new ArrayList<>(); - if("1".equals(oaTask.getTasklevel())){ - //修改任务读取状态 - sysUserId = getListPerformId(sysUserId); - oaDistributionMapper.changeStatus(oaTask.getOataskid(),sysUserId); - //查询部门 - distributions = oaDistributionMapper.receiveUnit(oaTask.getOataskid()); - }else if("2".equals(oaTask.getTasklevel())){ - //修改任务读取状态 - oaDistributionMapper.changeStatus(oaTask.getOataskid(),sysUserId); - //查询用户 - distributions = oaDistributionMapper.receiveUser(oaTask.getOataskid()); - String unitName = getUnitName(oaTask.getTaskperson()); - if(null != distributions && distributions.size() > 0 && StringUtils.isNotBlank(unitName)){ - for (OADistribution distribution : distributions){ - distribution.setReceiveName(unitName + "-" + distribution.getReceiveName()); - } - } - } + //修改任务读取状态 + sysUserId = getListPerformId(sysUserId); + oaDistributionMapper.changeStatus(oaTask.getOataskid(),sysUserId); + //查询部门 + distributions = oaDistributionMapper.receiveUnit(oaTask.getOataskid()); + oaTask.setDistributions(distributions); if("上级提醒".equals(oaTask.getTasktype())){ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index a5aa1ca..102911e 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -2129,8 +2129,6 @@ public class MinWorkController extends BaseController{ //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); - //保存监管人员 - addUserEnt(sysEnterpriseDo.getUserId(),sysEnterprise.getSysenterpriseid(),sysUser.getChinaname()); if (result > 0){ singleResult.setMessage(Message.SUCCESS); singleResult.setCode(Code.SUCCESS.getCode()); @@ -2142,28 +2140,6 @@ public class MinWorkController extends BaseController{ return singleResult; } - /** - * 保存企业监管人员 - * @throws Exception - */ - private void addUserEnt(String userId,String entId,String chinaName)throws Exception{ - if(StringUtils.isNotBlank(userId)){ - String[] strs = userId.split(","); - for (String str : strs){ - EntUser entUser = new EntUser(); - entUser.setEntUserId(RandomNumber.getUUid()); - entUser.setEntId(entId); - entUser.setUserId(str); - entUser.setCreateTime(new Date()); - entUser.setCreated(chinaName); - entUser.setModifyTime(new Date()); - entUser.setModified(chinaName); - entUserMapper.insert(entUser); - } - } - - } - /** * PC新增最小工作单元格清单 * */ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 0634fac..f15ef30 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -13,13 +13,11 @@ import com.rzyc.bean.SysEnterpriseDo; import com.rzyc.bean.check.dto.LawAddDto; import com.rzyc.bean.check.dto.TalkAddDto; import com.rzyc.bean.ent.*; -import com.rzyc.bean.user.dto.LoginDto; import com.rzyc.bean.user.dto.WeChartLoginDto; import com.rzyc.model.*; import com.rzyc.model.check.*; import com.rzyc.model.ent.EntBillCon; import com.rzyc.model.ent.EntPromise; -import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.SysEnterprise; import com.rzyc.model.user.SysUnit; import com.rzyc.model.user.SysUser; @@ -597,8 +595,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); - //保存监管人员 - addUserEnt(sysEnterpriseDo.getUserId(),sysEnterprise.getSysenterpriseid(),sysUser.getChinaname()); + if (result > 0){ singleResult.setMessage(Message.SUCCESS); singleResult.setCode(Code.SUCCESS.getCode()); @@ -610,27 +607,6 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { return singleResult; } - /** - * 保存企业监管人员 - * @throws Exception - */ - private void addUserEnt(String userId,String entId,String chinaName)throws Exception{ - if(StringUtils.isNotBlank(userId)){ - String[] strs = userId.split(","); - for (String str : strs){ - EntUser entUser = new EntUser(); - entUser.setEntUserId(RandomNumber.getUUid()); - entUser.setEntId(entId); - entUser.setUserId(str); - entUser.setCreateTime(new Date()); - entUser.setCreated(chinaName); - entUser.setModifyTime(new Date()); - entUser.setModified(chinaName); - entUserMapper.insert(entUser); - } - } - - }