From 24c40855613368fc2462b41777f451bab6a88863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= Date: Wed, 21 Sep 2022 17:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8A=A5=E9=94=99=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzyc/mapper/ent/EntDutyerMapper.java | 31 - .../java/com/rzyc/model/ent/EntDutyer.java | 139 ---- .../com/rzyc/model/ent/EntDutyerExample.java | 633 ------------------ .../resources/mapper/ent/EntDutyerMapper.xml | 206 ------ .../resources/mapper/ent/InEntListMapper.xml | 2 +- inventory-ent/pom.xml | 32 - .../com/rzyc/controller/BaseController.java | 4 - inventory-gov/pom.xml | 32 - .../com/rzyc/controller/BaseController.java | 4 - .../com/rzyc/controller/ImportController.java | 10 - 10 files changed, 1 insertion(+), 1092 deletions(-) delete mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDutyerMapper.java delete mode 100644 inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyer.java delete mode 100644 inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyerExample.java delete mode 100644 inventory-dao/src/main/resources/mapper/ent/EntDutyerMapper.xml diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDutyerMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDutyerMapper.java deleted file mode 100644 index 1121907..0000000 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDutyerMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.rzyc.mapper.ent; - -import com.rzyc.model.ent.EntDutyer; -import com.rzyc.model.ent.EntDutyerExample; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface EntDutyerMapper { - long countByExample(EntDutyerExample example); - - int deleteByExample(EntDutyerExample example); - - int insert(EntDutyer record); - - int insertSelective(EntDutyer record); - - List selectByExample(EntDutyerExample example); - - int updateByExampleSelective(@Param("record") EntDutyer record, @Param("example") EntDutyerExample example); - - int updateByExample(@Param("record") EntDutyer record, @Param("example") EntDutyerExample example); - - /*删除企业责任人*/ - Integer delEntId(@Param("entId") String entId); - - /*企业负责人*/ - EntDutyer findByEntId(@Param("entId") String entId); -} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyer.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyer.java deleted file mode 100644 index de1405c..0000000 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyer.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.rzyc.model.ent; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author - */ -public class EntDutyer implements Serializable { - /** - * 企业责任人id - */ - private String dutyerId; - - /** - * 企业id - */ - private String entId; - - /** - * 镇街包片领导id - */ - private String leaderId; - - /** - * 镇街定点干部id - */ - private String cadreId; - - /** - * 村社定点干部id - */ - private String villageId; - - /** - * 创建时间 - */ - private Date createTime; - - private static final long serialVersionUID = 1L; - - public String getDutyerId() { - return dutyerId; - } - - public void setDutyerId(String dutyerId) { - this.dutyerId = dutyerId; - } - - public String getEntId() { - return entId; - } - - public void setEntId(String entId) { - this.entId = entId; - } - - public String getLeaderId() { - return leaderId; - } - - public void setLeaderId(String leaderId) { - this.leaderId = leaderId; - } - - public String getCadreId() { - return cadreId; - } - - public void setCadreId(String cadreId) { - this.cadreId = cadreId; - } - - public String getVillageId() { - return villageId; - } - - public void setVillageId(String villageId) { - this.villageId = villageId; - } - - 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; - } - EntDutyer other = (EntDutyer) that; - return (this.getDutyerId() == null ? other.getDutyerId() == null : this.getDutyerId().equals(other.getDutyerId())) - && (this.getEntId() == null ? other.getEntId() == null : this.getEntId().equals(other.getEntId())) - && (this.getLeaderId() == null ? other.getLeaderId() == null : this.getLeaderId().equals(other.getLeaderId())) - && (this.getCadreId() == null ? other.getCadreId() == null : this.getCadreId().equals(other.getCadreId())) - && (this.getVillageId() == null ? other.getVillageId() == null : this.getVillageId().equals(other.getVillageId())) - && (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 + ((getDutyerId() == null) ? 0 : getDutyerId().hashCode()); - result = prime * result + ((getEntId() == null) ? 0 : getEntId().hashCode()); - result = prime * result + ((getLeaderId() == null) ? 0 : getLeaderId().hashCode()); - result = prime * result + ((getCadreId() == null) ? 0 : getCadreId().hashCode()); - result = prime * result + ((getVillageId() == null) ? 0 : getVillageId().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(", dutyerId=").append(dutyerId); - sb.append(", entId=").append(entId); - sb.append(", leaderId=").append(leaderId); - sb.append(", cadreId=").append(cadreId); - sb.append(", villageId=").append(villageId); - 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/EntDutyerExample.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyerExample.java deleted file mode 100644 index 2e1affa..0000000 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntDutyerExample.java +++ /dev/null @@ -1,633 +0,0 @@ -package com.rzyc.model.ent; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class EntDutyerExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public EntDutyerExample() { - 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 andDutyerIdIsNull() { - addCriterion("dutyer_id is null"); - return (Criteria) this; - } - - public Criteria andDutyerIdIsNotNull() { - addCriterion("dutyer_id is not null"); - return (Criteria) this; - } - - public Criteria andDutyerIdEqualTo(String value) { - addCriterion("dutyer_id =", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdNotEqualTo(String value) { - addCriterion("dutyer_id <>", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdGreaterThan(String value) { - addCriterion("dutyer_id >", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdGreaterThanOrEqualTo(String value) { - addCriterion("dutyer_id >=", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdLessThan(String value) { - addCriterion("dutyer_id <", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdLessThanOrEqualTo(String value) { - addCriterion("dutyer_id <=", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdLike(String value) { - addCriterion("dutyer_id like", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdNotLike(String value) { - addCriterion("dutyer_id not like", value, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdIn(List values) { - addCriterion("dutyer_id in", values, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdNotIn(List values) { - addCriterion("dutyer_id not in", values, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdBetween(String value1, String value2) { - addCriterion("dutyer_id between", value1, value2, "dutyerId"); - return (Criteria) this; - } - - public Criteria andDutyerIdNotBetween(String value1, String value2) { - addCriterion("dutyer_id not between", value1, value2, "dutyerId"); - 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 andLeaderIdIsNull() { - addCriterion("leader_id is null"); - return (Criteria) this; - } - - public Criteria andLeaderIdIsNotNull() { - addCriterion("leader_id is not null"); - return (Criteria) this; - } - - public Criteria andLeaderIdEqualTo(String value) { - addCriterion("leader_id =", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdNotEqualTo(String value) { - addCriterion("leader_id <>", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdGreaterThan(String value) { - addCriterion("leader_id >", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdGreaterThanOrEqualTo(String value) { - addCriterion("leader_id >=", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdLessThan(String value) { - addCriterion("leader_id <", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdLessThanOrEqualTo(String value) { - addCriterion("leader_id <=", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdLike(String value) { - addCriterion("leader_id like", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdNotLike(String value) { - addCriterion("leader_id not like", value, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdIn(List values) { - addCriterion("leader_id in", values, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdNotIn(List values) { - addCriterion("leader_id not in", values, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdBetween(String value1, String value2) { - addCriterion("leader_id between", value1, value2, "leaderId"); - return (Criteria) this; - } - - public Criteria andLeaderIdNotBetween(String value1, String value2) { - addCriterion("leader_id not between", value1, value2, "leaderId"); - return (Criteria) this; - } - - public Criteria andCadreIdIsNull() { - addCriterion("cadre_id is null"); - return (Criteria) this; - } - - public Criteria andCadreIdIsNotNull() { - addCriterion("cadre_id is not null"); - return (Criteria) this; - } - - public Criteria andCadreIdEqualTo(String value) { - addCriterion("cadre_id =", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdNotEqualTo(String value) { - addCriterion("cadre_id <>", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdGreaterThan(String value) { - addCriterion("cadre_id >", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdGreaterThanOrEqualTo(String value) { - addCriterion("cadre_id >=", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdLessThan(String value) { - addCriterion("cadre_id <", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdLessThanOrEqualTo(String value) { - addCriterion("cadre_id <=", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdLike(String value) { - addCriterion("cadre_id like", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdNotLike(String value) { - addCriterion("cadre_id not like", value, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdIn(List values) { - addCriterion("cadre_id in", values, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdNotIn(List values) { - addCriterion("cadre_id not in", values, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdBetween(String value1, String value2) { - addCriterion("cadre_id between", value1, value2, "cadreId"); - return (Criteria) this; - } - - public Criteria andCadreIdNotBetween(String value1, String value2) { - addCriterion("cadre_id not between", value1, value2, "cadreId"); - return (Criteria) this; - } - - public Criteria andVillageIdIsNull() { - addCriterion("village_id is null"); - return (Criteria) this; - } - - public Criteria andVillageIdIsNotNull() { - addCriterion("village_id is not null"); - return (Criteria) this; - } - - public Criteria andVillageIdEqualTo(String value) { - addCriterion("village_id =", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdNotEqualTo(String value) { - addCriterion("village_id <>", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdGreaterThan(String value) { - addCriterion("village_id >", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdGreaterThanOrEqualTo(String value) { - addCriterion("village_id >=", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdLessThan(String value) { - addCriterion("village_id <", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdLessThanOrEqualTo(String value) { - addCriterion("village_id <=", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdLike(String value) { - addCriterion("village_id like", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdNotLike(String value) { - addCriterion("village_id not like", value, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdIn(List values) { - addCriterion("village_id in", values, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdNotIn(List values) { - addCriterion("village_id not in", values, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdBetween(String value1, String value2) { - addCriterion("village_id between", value1, value2, "villageId"); - return (Criteria) this; - } - - public Criteria andVillageIdNotBetween(String value1, String value2) { - addCriterion("village_id not between", value1, value2, "villageId"); - 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/resources/mapper/ent/EntDutyerMapper.xml b/inventory-dao/src/main/resources/mapper/ent/EntDutyerMapper.xml deleted file mode 100644 index 95f5eca..0000000 --- a/inventory-dao/src/main/resources/mapper/ent/EntDutyerMapper.xml +++ /dev/null @@ -1,206 +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} - - - - - - - - - - - dutyer_id, ent_id, leader_id, cadre_id, village_id, create_time - - - - delete from ent_dutyer - - - - - - insert into ent_dutyer (dutyer_id, ent_id, leader_id, - cadre_id, village_id, create_time - ) - values (#{dutyerId,jdbcType=VARCHAR}, #{entId,jdbcType=VARCHAR}, #{leaderId,jdbcType=VARCHAR}, - #{cadreId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP} - ) - - - insert into ent_dutyer - - - dutyer_id, - - - ent_id, - - - leader_id, - - - cadre_id, - - - village_id, - - - create_time, - - - - - #{dutyerId,jdbcType=VARCHAR}, - - - #{entId,jdbcType=VARCHAR}, - - - #{leaderId,jdbcType=VARCHAR}, - - - #{cadreId,jdbcType=VARCHAR}, - - - #{villageId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - update ent_dutyer - - - dutyer_id = #{record.dutyerId,jdbcType=VARCHAR}, - - - ent_id = #{record.entId,jdbcType=VARCHAR}, - - - leader_id = #{record.leaderId,jdbcType=VARCHAR}, - - - cadre_id = #{record.cadreId,jdbcType=VARCHAR}, - - - village_id = #{record.villageId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - update ent_dutyer - set dutyer_id = #{record.dutyerId,jdbcType=VARCHAR}, - ent_id = #{record.entId,jdbcType=VARCHAR}, - leader_id = #{record.leaderId,jdbcType=VARCHAR}, - cadre_id = #{record.cadreId,jdbcType=VARCHAR}, - village_id = #{record.villageId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - - - delete from ent_dutyer where ent_id = #{entId} - - - - - diff --git a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml index c9c3e9f..aeab41c 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml @@ -26,7 +26,7 @@ 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 + item_basis, item_proof, item_law, sort_id,del_state, create_time, create_by, modify_time, modify_by diff --git a/inventory-ent/pom.xml b/inventory-ent/pom.xml index 863ebf2..91eb5f5 100644 --- a/inventory-ent/pom.xml +++ b/inventory-ent/pom.xml @@ -70,38 +70,6 @@ - - - mysql - mysql-connector-java - 8.0.12 - - - org.freemarker - freemarker - 2.3.30 - - - - - - com.baomidou - mybatis-plus-boot-starter - 3.4.0 - - - com.baomidou - mybatis-plus - 3.4.0 - - - com.baomidou - mybatis-plus-generator - 3.3.2 - - - - 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 3b95bed..c87146e 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java @@ -340,10 +340,6 @@ public class BaseController { @Autowired protected DutyTreeMapper dutyTreeMapper; - //企业责任人 - @Autowired - protected EntDutyerMapper entDutyerMapper; - //第三方机构 @Autowired protected OrganizationMapper organizationMapper; diff --git a/inventory-gov/pom.xml b/inventory-gov/pom.xml index 56adec3..e06e86e 100644 --- a/inventory-gov/pom.xml +++ b/inventory-gov/pom.xml @@ -70,38 +70,6 @@ - - - mysql - mysql-connector-java - 8.0.30 - - - org.freemarker - freemarker - 2.3.30 - - - - - - com.baomidou - mybatis-plus-boot-starter - 3.4.0 - - - com.baomidou - mybatis-plus - 3.4.0 - - - com.baomidou - mybatis-plus-generator - 3.3.2 - - - - 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 bc8b438..9ff71a4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -340,10 +340,6 @@ public class BaseController { @Autowired protected DutyTreeMapper dutyTreeMapper; - //企业责任人 - @Autowired - protected EntDutyerMapper entDutyerMapper; - //第三方机构 @Autowired protected OrganizationMapper organizationMapper; diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java index 61bfb3a..dd378ad 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ImportController.java @@ -1501,16 +1501,6 @@ public class ImportController extends com.rzyc.controller.BaseController { } } - EntDutyer entDutyer = new EntDutyer(); - entDutyer.setDutyerId(RandomNumber.getUUid()); - entDutyer.setEntId(enterprise.getSysenterpriseid()); - entDutyer.setLeaderId(leaderId); - entDutyer.setCadreId(cadreId); - entDutyer.setVillageId(villageId); - entDutyer.setCreateTime(new Date()); - entDutyerMapper.delEntId(enterprise.getSysenterpriseid()); - entDutyerMapper.insert(entDutyer); - createEntUser(enterprise, "管理员",null); index++;