Skip to content
GitLab
Commit 8cfdc3dc authored by 季圣华's avatar 季圣华
Browse files

优化用户和单据的sql

parent 193144f1
Expand all Hide whitespace changes
Inline Side-by-side
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View file @ 8cfdc3dc
...@@ -6,118 +6,46 @@ import java.util.Date; ...@@ -6,118 +6,46 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class DepotHeadExample { public class DepotHeadExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public DepotHeadExample() { public DepotHeadExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<Criteria>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
...@@ -126,35 +54,17 @@ public class DepotHeadExample { ...@@ -126,35 +54,17 @@ public class DepotHeadExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
...@@ -2207,12 +2117,6 @@ public class DepotHeadExample { ...@@ -2207,12 +2117,6 @@ public class DepotHeadExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depothead
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
...@@ -2220,12 +2124,6 @@ public class DepotHeadExample { ...@@ -2220,12 +2124,6 @@ public class DepotHeadExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;
......
src/main/java/com/jsh/erp/datasource/entities/User.java
View file @ 8cfdc3dc
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class User { public class User {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.username
*
* @mbggenerated
*/
private String username; private String username;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.loginame
*
* @mbggenerated
*/
private String loginame; private String loginame;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.password
*
* @mbggenerated
*/
private String password; private String password;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.position
*
* @mbggenerated
*/
private String position; private String position;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.department
*
* @mbggenerated
*/
private String department; private String department;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.email
*
* @mbggenerated
*/
private String email; private String email;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.phonenum
*
* @mbggenerated
*/
private String phonenum; private String phonenum;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.ismanager
*
* @mbggenerated
*/
private Byte ismanager; private Byte ismanager;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.isystem
*
* @mbggenerated
*/
private Byte isystem; private Byte isystem;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.Status
*
* @mbggenerated
*/
private Byte status; private Byte status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.description
*
* @mbggenerated
*/
private String description; private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.remark
*
* @mbggenerated
*/
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_user.tenant_id
*
* @mbggenerated
*/
private Long tenantId; private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.id
*
* @return the value of jsh_user.id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.id
*
* @param id the value for jsh_user.id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.username
*
* @return the value of jsh_user.username
*
* @mbggenerated
*/
public String getUsername() { public String getUsername() {
return username; return username;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.username
*
* @param username the value for jsh_user.username
*
* @mbggenerated
*/
public void setUsername(String username) { public void setUsername(String username) {
this.username = username == null ? null : username.trim(); this.username = username == null ? null : username.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.loginame
*
* @return the value of jsh_user.loginame
*
* @mbggenerated
*/
public String getLoginame() { public String getLoginame() {
return loginame; return loginame;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.loginame
*
* @param loginame the value for jsh_user.loginame
*
* @mbggenerated
*/
public void setLoginame(String loginame) { public void setLoginame(String loginame) {
this.loginame = loginame == null ? null : loginame.trim(); this.loginame = loginame == null ? null : loginame.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.password
*
* @return the value of jsh_user.password
*
* @mbggenerated
*/
public String getPassword() { public String getPassword() {
return password; return password;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.password
*
* @param password the value for jsh_user.password
*
* @mbggenerated
*/
public void setPassword(String password) { public void setPassword(String password) {
this.password = password == null ? null : password.trim(); this.password = password == null ? null : password.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.position
*
* @return the value of jsh_user.position
*
* @mbggenerated
*/
public String getPosition() { public String getPosition() {
return position; return position;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.position
*
* @param position the value for jsh_user.position
*
* @mbggenerated
*/
public void setPosition(String position) { public void setPosition(String position) {
this.position = position == null ? null : position.trim(); this.position = position == null ? null : position.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.department
*
* @return the value of jsh_user.department
*
* @mbggenerated
*/
public String getDepartment() { public String getDepartment() {
return department; return department;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.department
*
* @param department the value for jsh_user.department
*
* @mbggenerated
*/
public void setDepartment(String department) { public void setDepartment(String department) {
this.department = department == null ? null : department.trim(); this.department = department == null ? null : department.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.email
*
* @return the value of jsh_user.email
*
* @mbggenerated
*/
public String getEmail() { public String getEmail() {
return email; return email;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.email
*
* @param email the value for jsh_user.email
*
* @mbggenerated
*/
public void setEmail(String email) { public void setEmail(String email) {
this.email = email == null ? null : email.trim(); this.email = email == null ? null : email.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.phonenum
*
* @return the value of jsh_user.phonenum
*
* @mbggenerated
*/
public String getPhonenum() { public String getPhonenum() {
return phonenum; return phonenum;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.phonenum
*
* @param phonenum the value for jsh_user.phonenum
*
* @mbggenerated
*/
public void setPhonenum(String phonenum) { public void setPhonenum(String phonenum) {
this.phonenum = phonenum == null ? null : phonenum.trim(); this.phonenum = phonenum == null ? null : phonenum.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.ismanager
*
* @return the value of jsh_user.ismanager
*
* @mbggenerated
*/
public Byte getIsmanager() { public Byte getIsmanager() {
return ismanager; return ismanager;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.ismanager
*
* @param ismanager the value for jsh_user.ismanager
*
* @mbggenerated
*/
public void setIsmanager(Byte ismanager) { public void setIsmanager(Byte ismanager) {
this.ismanager = ismanager; this.ismanager = ismanager;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.isystem
*
* @return the value of jsh_user.isystem
*
* @mbggenerated
*/
public Byte getIsystem() { public Byte getIsystem() {
return isystem; return isystem;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.isystem
*
* @param isystem the value for jsh_user.isystem
*
* @mbggenerated
*/
public void setIsystem(Byte isystem) { public void setIsystem(Byte isystem) {
this.isystem = isystem; this.isystem = isystem;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.Status
*
* @return the value of jsh_user.Status
*
* @mbggenerated
*/
public Byte getStatus() { public Byte getStatus() {
return status; return status;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.Status
*
* @param status the value for jsh_user.Status
*
* @mbggenerated
*/
public void setStatus(Byte status) { public void setStatus(Byte status) {
this.status = status; this.status = status;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.description
*
* @return the value of jsh_user.description
*
* @mbggenerated
*/
public String getDescription() { public String getDescription() {
return description; return description;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.description
*
* @param description the value for jsh_user.description
*
* @mbggenerated
*/
public void setDescription(String description) { public void setDescription(String description) {
this.description = description == null ? null : description.trim(); this.description = description == null ? null : description.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.remark
*
* @return the value of jsh_user.remark
*
* @mbggenerated
*/
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.remark
*
* @param remark the value for jsh_user.remark
*
* @mbggenerated
*/
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_user.tenant_id
*
* @return the value of jsh_user.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_user.tenant_id
*
* @param tenantId the value for jsh_user.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }
......
src/main/java/com/jsh/erp/datasource/entities/UserExample.java
View file @ 8cfdc3dc
...@@ -4,118 +4,46 @@ import java.util.ArrayList; ...@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class UserExample { public class UserExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_user
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_user
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_user
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public UserExample() { public UserExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<Criteria>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
...@@ -124,35 +52,17 @@ public class UserExample { ...@@ -124,35 +52,17 @@ public class UserExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_user
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
...@@ -1125,12 +1035,6 @@ public class UserExample { ...@@ -1125,12 +1035,6 @@ public class UserExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_user
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
...@@ -1138,12 +1042,6 @@ public class UserExample { ...@@ -1138,12 +1042,6 @@ public class UserExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_user
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;
......
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View file @ 8cfdc3dc
...@@ -6,91 +6,25 @@ import java.util.List; ...@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface DepotHeadMapper { public interface DepotHeadMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int countByExample(DepotHeadExample example); int countByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByExample(DepotHeadExample example); int deleteByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insert(DepotHead record); int insert(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int insertSelective(DepotHead record); int insertSelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
List<DepotHead> selectByExample(DepotHeadExample example); List<DepotHead> selectByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
DepotHead selectByPrimaryKey(Long id); DepotHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(DepotHead record); int updateByPrimaryKeySelective(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotHead record); int updateByPrimaryKey(DepotHead record);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View file @ 8cfdc3dc
...@@ -102,10 +102,6 @@ public interface DepotHeadMapperEx { ...@@ -102,10 +102,6 @@ public interface DepotHeadMapperEx {
List<DepotHeadVo4List> getDetailByNumber( List<DepotHeadVo4List> getDetailByNumber(
@Param("number") String number); @Param("number") String number);
/**
* 新增单据主表信息，并反显单据主表id
* */
int adddepotHead(DepotHead depotHead);
void updateBuildOnlyNumber(); void updateBuildOnlyNumber();
/** /**
......
src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java
View file @ 8cfdc3dc
...@@ -6,91 +6,25 @@ import java.util.List; ...@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface UserMapper { public interface UserMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int countByExample(UserExample example); int countByExample(UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int deleteByExample(UserExample example); int deleteByExample(UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int insert(User record); int insert(User record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int insertSelective(User record); int insertSelective(User record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
List<User> selectByExample(UserExample example); List<User> selectByExample(UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
User selectByPrimaryKey(Long id); User selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int updateByExample(@Param("record") User record, @Param("example") UserExample example); int updateByExample(@Param("record") User record, @Param("example") UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(User record); int updateByPrimaryKeySelective(User record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_user
*
* @mbggenerated
*/
int updateByPrimaryKey(User record); int updateByPrimaryKey(User record);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
View file @ 8cfdc3dc
...@@ -25,10 +25,6 @@ public interface UserMapperEx { ...@@ -25,10 +25,6 @@ public interface UserMapperEx {
List<UserEx> getUserList(Map<String, Object> parameterMap); List<UserEx> getUserList(Map<String, Object> parameterMap);
int addUser(UserEx ue);
int updateUser(UserEx ue);
List<User> getUserListByUserNameOrLoginName(@Param("userName") String userName, List<User> getUserListByUserNameOrLoginName(@Param("userName") String userName,
@Param("loginame") String loginame); @Param("loginame") String loginame);
......
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View file @ 8cfdc3dc
...@@ -489,7 +489,7 @@ public class DepotHeadService { ...@@ -489,7 +489,7 @@ public class DepotHeadService {
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT); depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
try{ try{
depotHeadMapperEx.adddepotHead(depotHead); depotHeadMapper.insertSelective(depotHead);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
......
src/main/java/com/jsh/erp/service/user/UserService.java
View file @ 8cfdc3dc
...@@ -365,7 +365,7 @@ public class UserService { ...@@ -365,7 +365,7 @@ public class UserService {
ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
int result=0; int result=0;
try{ try{
result= userMapperEx.addUser(ue); result= userMapper.insertSelective(ue);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
...@@ -396,7 +396,7 @@ public class UserService { ...@@ -396,7 +396,7 @@ public class UserService {
ue.setStatus(BusinessConstants.USER_STATUS_NORMAL); ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
int result=0; int result=0;
try{ try{
result= userMapperEx.addUser(ue); result= userMapper.insertSelective(ue);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
...@@ -490,7 +490,7 @@ public class UserService { ...@@ -490,7 +490,7 @@ public class UserService {
public UserEx updateUser(UserEx ue)throws Exception{ public UserEx updateUser(UserEx ue)throws Exception{
int result =0; int result =0;
try{ try{
result=userMapperEx.updateUser(ue); result=userMapper.updateByPrimaryKeySelective(ue);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
......
src/main/resources/mapper_xml/DepotHeadMapper.xml
View file @ 8cfdc3dc
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" /> <id column="Id" jdbcType="BIGINT" property="id" />
<result column="Type" jdbcType="VARCHAR" property="type" /> <result column="Type" jdbcType="VARCHAR" property="type" />
<result column="SubType" jdbcType="VARCHAR" property="subtype" /> <result column="SubType" jdbcType="VARCHAR" property="subtype" />
...@@ -39,10 +35,6 @@ ...@@ -39,10 +35,6 @@
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -72,10 +64,6 @@ ...@@ -72,10 +64,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -105,10 +93,6 @@ ...@@ -105,10 +93,6 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime,
OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice,
PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney,
...@@ -116,10 +100,6 @@ ...@@ -116,10 +100,6 @@
LinkNumber, tenant_id, delete_Flag LinkNumber, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
...@@ -134,38 +114,25 @@ ...@@ -134,38 +114,25 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_depothead from jsh_depothead
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_depothead delete from jsh_depothead
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_depothead delete from jsh_depothead
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
<!-- <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
WARNING - @mbggenerated SELECT LAST_INSERT_ID()
This element is automatically generated by MyBatis Generator, do not modify. </selectKey>
-->
insert into jsh_depothead (Id, Type, SubType, insert into jsh_depothead (Id, Type, SubType,
ProjectId, DefaultNumber, Number, ProjectId, DefaultNumber, Number,
OperPersonName, CreateTime, OperTime, OperPersonName, CreateTime, OperTime,
...@@ -190,15 +157,12 @@ ...@@ -190,15 +157,12 @@
#{deleteFlag,jdbcType=VARCHAR}) #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
<!-- <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
WARNING - @mbggenerated SELECT LAST_INSERT_ID()
This element is automatically generated by MyBatis Generator, do not modify. </selectKey>
-->
insert into jsh_depothead insert into jsh_depothead
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> Id,
Id,
</if>
<if test="type != null"> <if test="type != null">
Type, Type,
</if> </if>
...@@ -291,9 +255,7 @@ ...@@ -291,9 +255,7 @@
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> #{id,jdbcType=BIGINT},
#{id,jdbcType=BIGINT},
</if>
<if test="type != null"> <if test="type != null">
#{type,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
</if> </if>
...@@ -387,20 +349,12 @@ ...@@ -387,20 +349,12 @@
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_depothead select count(*) from jsh_depothead
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depothead update jsh_depothead
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
...@@ -502,10 +456,6 @@ ...@@ -502,10 +456,6 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depothead update jsh_depothead
set Id = #{record.id,jdbcType=BIGINT}, set Id = #{record.id,jdbcType=BIGINT},
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
...@@ -543,10 +493,6 @@ ...@@ -543,10 +493,6 @@
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depothead update jsh_depothead
<set> <set>
<if test="type != null"> <if test="type != null">
...@@ -643,10 +589,6 @@ ...@@ -643,10 +589,6 @@
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depothead update jsh_depothead
set Type = #{type,jdbcType=VARCHAR}, set Type = #{type,jdbcType=VARCHAR},
SubType = #{subtype,jdbcType=VARCHAR}, SubType = #{subtype,jdbcType=VARCHAR},
......
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View file @ 8cfdc3dc
...@@ -324,30 +324,6 @@ ...@@ -324,30 +324,6 @@
and ifnull(dh.delete_Flag,'0') !='1' and ifnull(dh.delete_Flag,'0') !='1'
</select> </select>
<insert id="adddepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHead"
useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_depothead (Type, SubType,
ProjectId, DefaultNumber, Number,
OperPersonName, CreateTime, OperTime,
OrganId, HandsPersonId, AccountId,
ChangeAmount, AllocationProjectId, TotalPrice,
PayType, Remark, Salesman,
AccountIdList, AccountMoneyList, Discount,
DiscountMoney, DiscountLastMoney, OtherMoney,
OtherMoneyList, OtherMoneyItem, AccountDay,
Status, LinkNumber)
values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
#{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT},
#{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL},
#{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR},
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
#{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
</insert>
<update id="updateBuildOnlyNumber"> <update id="updateBuildOnlyNumber">
update jsh_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq' update jsh_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq'
</update> </update>
......
src/main/resources/mapper_xml/UserMapper.xml
View file @ 8cfdc3dc
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.UserMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.UserMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.User"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.User">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="username" jdbcType="VARCHAR" property="username" /> <result column="username" jdbcType="VARCHAR" property="username" />
<result column="loginame" jdbcType="VARCHAR" property="loginame" /> <result column="loginame" jdbcType="VARCHAR" property="loginame" />
...@@ -22,10 +18,6 @@ ...@@ -22,10 +18,6 @@
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -55,10 +47,6 @@ ...@@ -55,10 +47,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -88,18 +76,10 @@ ...@@ -88,18 +76,10 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, username, loginame, password, position, department, email, phonenum, ismanager, id, username, loginame, password, position, department, email, phonenum, ismanager,
isystem, Status, description, remark, tenant_id isystem, Status, description, remark, tenant_id
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
...@@ -114,38 +94,25 @@ ...@@ -114,38 +94,25 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_user from jsh_user
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_user delete from jsh_user
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.UserExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.UserExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_user delete from jsh_user
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.User"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
<!-- <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
WARNING - @mbggenerated SELECT LAST_INSERT_ID()
This element is automatically generated by MyBatis Generator, do not modify. </selectKey>
-->
insert into jsh_user (id, username, loginame, insert into jsh_user (id, username, loginame,
password, position, department, password, position, department,
email, phonenum, ismanager, email, phonenum, ismanager,
...@@ -158,15 +125,12 @@ ...@@ -158,15 +125,12 @@
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
<!-- <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
WARNING - @mbggenerated SELECT LAST_INSERT_ID()
This element is automatically generated by MyBatis Generator, do not modify. </selectKey>
-->
insert into jsh_user insert into jsh_user
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> id,
id,
</if>
<if test="username != null"> <if test="username != null">
username, username,
</if> </if>
...@@ -208,9 +172,7 @@ ...@@ -208,9 +172,7 @@
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> #{id,jdbcType=BIGINT},
#{id,jdbcType=BIGINT},
</if>
<if test="username != null"> <if test="username != null">
#{username,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR},
</if> </if>
...@@ -253,20 +215,12 @@ ...@@ -253,20 +215,12 @@
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_user select count(*) from jsh_user
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_user update jsh_user
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
...@@ -317,10 +271,6 @@ ...@@ -317,10 +271,6 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_user update jsh_user
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
username = #{record.username,jdbcType=VARCHAR}, username = #{record.username,jdbcType=VARCHAR},
...@@ -341,10 +291,6 @@ ...@@ -341,10 +291,6 @@
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.User"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.User">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_user update jsh_user
<set> <set>
<if test="username != null"> <if test="username != null">
...@@ -390,10 +336,6 @@ ...@@ -390,10 +336,6 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.User"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.User">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_user update jsh_user
set username = #{username,jdbcType=VARCHAR}, set username = #{username,jdbcType=VARCHAR},
loginame = #{loginame,jdbcType=VARCHAR}, loginame = #{loginame,jdbcType=VARCHAR},
......
src/main/resources/mapper_xml/UserMapperEx.xml
View file @ 8cfdc3dc
...@@ -54,61 +54,6 @@ ...@@ -54,61 +54,6 @@
</if> </if>
order by user.id desc order by user.id desc
</select> </select>
<insert id="addUser" parameterType="com.jsh.erp.datasource.entities.UserEx"
useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_user (username, loginame,
password, position,
email, phonenum, ismanager,
isystem, status, description,
remark)
values (#{username,jdbcType=VARCHAR}, #{loginame,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
#{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT},
#{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR})
</insert>
<update id="updateUser" parameterType="com.jsh.erp.datasource.entities.UserEx">
update jsh_user
<set>
<if test="username != null">
username = #{username,jdbcType=VARCHAR},
</if>
<if test="loginame != null">
loginame = #{loginame,jdbcType=VARCHAR},
</if>
<if test="password != null">
password = #{password,jdbcType=VARCHAR},
</if>
<if test="position != null">
position = #{position,jdbcType=VARCHAR},
</if>
<if test="department != null">
department = #{department,jdbcType=VARCHAR},
</if>
<if test="email != null">
email = #{email,jdbcType=VARCHAR},
</if>
<if test="phonenum != null">
phonenum = #{phonenum,jdbcType=VARCHAR},
</if>
<if test="ismanager != null">
ismanager = #{ismanager,jdbcType=TINYINT},
</if>
<if test="isystem != null">
isystem = #{isystem,jdbcType=TINYINT},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<select id="getUserListByUserNameOrLoginName" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap"> <select id="getUserListByUserNameOrLoginName" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
select user.id, user.username, user.loginame, user.position, user.email, user.phonenum, select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
user.description, user.remark,user.isystem user.description, user.remark,user.isystem
......
src/test/resources/generatorConfig.xml
View file @ 8cfdc3dc
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<context id="DB2Tables" targetRuntime="MyBatis3" defaultModelType="flat"> <context id="DB2Tables" targetRuntime="MyBatis3" defaultModelType="flat">
<commentGenerator> <commentGenerator>
<property name="suppressAllComments" value="false"/> <property name="suppressAllComments" value="true"/>
<property name="suppressDate" value="true"/> <property name="suppressDate" value="true"/>
</commentGenerator> </commentGenerator>
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
<table tableName="jsh_accounthead" domainObjectName="AccountHead"></table> <table tableName="jsh_accounthead" domainObjectName="AccountHead"></table>
<table tableName="jsh_accountitem" domainObjectName="AccountItem"></table> <table tableName="jsh_accountitem" domainObjectName="AccountItem"></table>
<table tableName="jsh_depot" domainObjectName="Depot"></table> <table tableName="jsh_depot" domainObjectName="Depot"></table>
<table tableName="jsh_depothead" domainObjectName="DepotHead"></table> <table tableName="jsh_depothead" domainObjectName="DepotHead">
<generatedKey column="id" sqlStatement="SELECT LAST_INSERT_ID()"/>
</table>
<table tableName="jsh_depotitem" domainObjectName="DepotItem"></table> <table tableName="jsh_depotitem" domainObjectName="DepotItem"></table>
<table tableName="jsh_functions" domainObjectName="Functions"></table> <table tableName="jsh_functions" domainObjectName="Functions"></table>
<table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table> <table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table>
...@@ -59,7 +61,9 @@ ...@@ -59,7 +61,9 @@
<table tableName="jsh_supplier" domainObjectName="Supplier"></table> <table tableName="jsh_supplier" domainObjectName="Supplier"></table>
<table tableName="jsh_systemconfig" domainObjectName="SystemConfig"></table> <table tableName="jsh_systemconfig" domainObjectName="SystemConfig"></table>
<table tableName="jsh_unit" domainObjectName="Unit"></table> <table tableName="jsh_unit" domainObjectName="Unit"></table>
<table tableName="jsh_user" domainObjectName="User"></table> <table tableName="jsh_user" domainObjectName="User">
<generatedKey column="id" sqlStatement="SELECT LAST_INSERT_ID()"/>
</table>
<table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table> <table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table>
<table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table> <table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>
<table tableName="jsh_organization" domainObjectName="Organization"></table> <table tableName="jsh_organization" domainObjectName="Organization"></table>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment