purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构-系统配置模块

Browse Source
This commit is contained in:
季圣华
2019-03-09 14:11:34 +08:00
parent 691b494c69
commit 3a0f0191b4
12 changed files with 885 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View File

@@ -11,35 +11,51 @@ public class SystemConfig {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.type
* This field corresponds to the database column jsh_systemconfig.company_name
*
* @mbggenerated
*/
private String type;
private String companyName;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.name
* This field corresponds to the database column jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
private String name;
private String companyContacts;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.value
* This field corresponds to the database column jsh_systemconfig.company_address
*
* @mbggenerated
*/
private String value;
private String companyAddress;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.description
* This field corresponds to the database column jsh_systemconfig.company_tel
*
* @mbggenerated
*/
private String description;
private String companyTel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_fax
*
* @mbggenerated
*/
private String companyFax;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
private String companyPostCode;
/**
* This method was generated by MyBatis Generator.
@@ -67,97 +83,145 @@ public class SystemConfig {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.type
* This method returns the value of the database column jsh_systemconfig.company_name
*
* @return the value of jsh_systemconfig.type
* @return the value of jsh_systemconfig.company_name
*
* @mbggenerated
*/
public String getType() {
return type;
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.type
* This method sets the value of the database column jsh_systemconfig.company_name
*
* @param type the value for jsh_systemconfig.type
* @param companyName the value for jsh_systemconfig.company_name
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.name
* This method returns the value of the database column jsh_systemconfig.company_contacts
*
* @return the value of jsh_systemconfig.name
* @return the value of jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public String getName() {
return name;
public String getCompanyContacts() {
return companyContacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.name
* This method sets the value of the database column jsh_systemconfig.company_contacts
*
* @param name the value for jsh_systemconfig.name
* @param companyContacts the value for jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
public void setCompanyContacts(String companyContacts) {
this.companyContacts = companyContacts == null ? null : companyContacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.value
* This method returns the value of the database column jsh_systemconfig.company_address
*
* @return the value of jsh_systemconfig.value
* @return the value of jsh_systemconfig.company_address
*
* @mbggenerated
*/
public String getValue() {
return value;
public String getCompanyAddress() {
return companyAddress;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.value
* This method sets the value of the database column jsh_systemconfig.company_address
*
* @param value the value for jsh_systemconfig.value
* @param companyAddress the value for jsh_systemconfig.company_address
*
* @mbggenerated
*/
public void setValue(String value) {
this.value = value == null ? null : value.trim();
public void setCompanyAddress(String companyAddress) {
this.companyAddress = companyAddress == null ? null : companyAddress.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.description
* This method returns the value of the database column jsh_systemconfig.company_tel
*
* @return the value of jsh_systemconfig.description
* @return the value of jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public String getDescription() {
return description;
public String getCompanyTel() {
return companyTel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.description
* This method sets the value of the database column jsh_systemconfig.company_tel
*
* @param description the value for jsh_systemconfig.description
* @param companyTel the value for jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
public void setCompanyTel(String companyTel) {
this.companyTel = companyTel == null ? null : companyTel.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_fax
*
* @return the value of jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public String getCompanyFax() {
return companyFax;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_fax
*
* @param companyFax the value for jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public void setCompanyFax(String companyFax) {
this.companyFax = companyFax == null ? null : companyFax.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_post_code
*
* @return the value of jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public String getCompanyPostCode() {
return companyPostCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_post_code
*
* @param companyPostCode the value for jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public void setCompanyPostCode(String companyPostCode) {
this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
}
}

364
src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
View File

@@ -254,283 +254,423 @@ public class SystemConfigExample {
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("type is null");
public Criteria andCompanyNameIsNull() {
addCriterion("company_name is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("type is not null");
public Criteria andCompanyNameIsNotNull() {
addCriterion("company_name is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("type =", value, "type");
public Criteria andCompanyNameEqualTo(String value) {
addCriterion("company_name =", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("type <>", value, "type");
public Criteria andCompanyNameNotEqualTo(String value) {
addCriterion("company_name <>", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("type >", value, "type");
public Criteria andCompanyNameGreaterThan(String value) {
addCriterion("company_name >", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("type >=", value, "type");
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
addCriterion("company_name >=", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("type <", value, "type");
public Criteria andCompanyNameLessThan(String value) {
addCriterion("company_name <", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("type <=", value, "type");
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
addCriterion("company_name <=", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("type like", value, "type");
public Criteria andCompanyNameLike(String value) {
addCriterion("company_name like", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("type not like", value, "type");
public Criteria andCompanyNameNotLike(String value) {
addCriterion("company_name not like", value, "companyName");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("type in", values, "type");
public Criteria andCompanyNameIn(List<String> values) {
addCriterion("company_name in", values, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("type not in", values, "type");
public Criteria andCompanyNameNotIn(List<String> values) {
addCriterion("company_name not in", values, "companyName");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("type between", value1, value2, "type");
public Criteria andCompanyNameBetween(String value1, String value2) {
addCriterion("company_name between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("type not between", value1, value2, "type");
public Criteria andCompanyNameNotBetween(String value1, String value2) {
addCriterion("company_name not between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("name is null");
public Criteria andCompanyContactsIsNull() {
addCriterion("company_contacts is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("name is not null");
public Criteria andCompanyContactsIsNotNull() {
addCriterion("company_contacts is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("name =", value, "name");
public Criteria andCompanyContactsEqualTo(String value) {
addCriterion("company_contacts =", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("name <>", value, "name");
public Criteria andCompanyContactsNotEqualTo(String value) {
addCriterion("company_contacts <>", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("name >", value, "name");
public Criteria andCompanyContactsGreaterThan(String value) {
addCriterion("company_contacts >", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("name >=", value, "name");
public Criteria andCompanyContactsGreaterThanOrEqualTo(String value) {
addCriterion("company_contacts >=", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("name <", value, "name");
public Criteria andCompanyContactsLessThan(String value) {
addCriterion("company_contacts <", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("name <=", value, "name");
public Criteria andCompanyContactsLessThanOrEqualTo(String value) {
addCriterion("company_contacts <=", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("name like", value, "name");
public Criteria andCompanyContactsLike(String value) {
addCriterion("company_contacts like", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("name not like", value, "name");
public Criteria andCompanyContactsNotLike(String value) {
addCriterion("company_contacts not like", value, "companyContacts");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("name in", values, "name");
public Criteria andCompanyContactsIn(List<String> values) {
addCriterion("company_contacts in", values, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("name not in", values, "name");
public Criteria andCompanyContactsNotIn(List<String> values) {
addCriterion("company_contacts not in", values, "companyContacts");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("name between", value1, value2, "name");
public Criteria andCompanyContactsBetween(String value1, String value2) {
addCriterion("company_contacts between", value1, value2, "companyContacts");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("name not between", value1, value2, "name");
public Criteria andCompanyContactsNotBetween(String value1, String value2) {
addCriterion("company_contacts not between", value1, value2, "companyContacts");
return (Criteria) this;
}
public Criteria andValueIsNull() {
addCriterion("value is null");
public Criteria andCompanyAddressIsNull() {
addCriterion("company_address is null");
return (Criteria) this;
}
public Criteria andValueIsNotNull() {
addCriterion("value is not null");
public Criteria andCompanyAddressIsNotNull() {
addCriterion("company_address is not null");
return (Criteria) this;
}
public Criteria andValueEqualTo(String value) {
addCriterion("value =", value, "value");
public Criteria andCompanyAddressEqualTo(String value) {
addCriterion("company_address =", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotEqualTo(String value) {
addCriterion("value <>", value, "value");
public Criteria andCompanyAddressNotEqualTo(String value) {
addCriterion("company_address <>", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueGreaterThan(String value) {
addCriterion("value >", value, "value");
public Criteria andCompanyAddressGreaterThan(String value) {
addCriterion("company_address >", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueGreaterThanOrEqualTo(String value) {
addCriterion("value >=", value, "value");
public Criteria andCompanyAddressGreaterThanOrEqualTo(String value) {
addCriterion("company_address >=", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLessThan(String value) {
addCriterion("value <", value, "value");
public Criteria andCompanyAddressLessThan(String value) {
addCriterion("company_address <", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLessThanOrEqualTo(String value) {
addCriterion("value <=", value, "value");
public Criteria andCompanyAddressLessThanOrEqualTo(String value) {
addCriterion("company_address <=", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueLike(String value) {
addCriterion("value like", value, "value");
public Criteria andCompanyAddressLike(String value) {
addCriterion("company_address like", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotLike(String value) {
addCriterion("value not like", value, "value");
public Criteria andCompanyAddressNotLike(String value) {
addCriterion("company_address not like", value, "companyAddress");
return (Criteria) this;
}
public Criteria andValueIn(List<String> values) {
addCriterion("value in", values, "value");
public Criteria andCompanyAddressIn(List<String> values) {
addCriterion("company_address in", values, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotIn(List<String> values) {
addCriterion("value not in", values, "value");
public Criteria andCompanyAddressNotIn(List<String> values) {
addCriterion("company_address not in", values, "companyAddress");
return (Criteria) this;
}
public Criteria andValueBetween(String value1, String value2) {
addCriterion("value between", value1, value2, "value");
public Criteria andCompanyAddressBetween(String value1, String value2) {
addCriterion("company_address between", value1, value2, "companyAddress");
return (Criteria) this;
}
public Criteria andValueNotBetween(String value1, String value2) {
addCriterion("value not between", value1, value2, "value");
public Criteria andCompanyAddressNotBetween(String value1, String value2) {
addCriterion("company_address not between", value1, value2, "companyAddress");
return (Criteria) this;
}
public Criteria andDescriptionIsNull() {
addCriterion("description is null");
public Criteria andCompanyTelIsNull() {
addCriterion("company_tel is null");
return (Criteria) this;
}
public Criteria andDescriptionIsNotNull() {
addCriterion("description is not null");
public Criteria andCompanyTelIsNotNull() {
addCriterion("company_tel is not null");
return (Criteria) this;
}
public Criteria andDescriptionEqualTo(String value) {
addCriterion("description =", value, "description");
public Criteria andCompanyTelEqualTo(String value) {
addCriterion("company_tel =", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotEqualTo(String value) {
addCriterion("description <>", value, "description");
public Criteria andCompanyTelNotEqualTo(String value) {
addCriterion("company_tel <>", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionGreaterThan(String value) {
addCriterion("description >", value, "description");
public Criteria andCompanyTelGreaterThan(String value) {
addCriterion("company_tel >", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("description >=", value, "description");
public Criteria andCompanyTelGreaterThanOrEqualTo(String value) {
addCriterion("company_tel >=", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLessThan(String value) {
addCriterion("description <", value, "description");
public Criteria andCompanyTelLessThan(String value) {
addCriterion("company_tel <", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLessThanOrEqualTo(String value) {
addCriterion("description <=", value, "description");
public Criteria andCompanyTelLessThanOrEqualTo(String value) {
addCriterion("company_tel <=", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionLike(String value) {
addCriterion("description like", value, "description");
public Criteria andCompanyTelLike(String value) {
addCriterion("company_tel like", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotLike(String value) {
addCriterion("description not like", value, "description");
public Criteria andCompanyTelNotLike(String value) {
addCriterion("company_tel not like", value, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionIn(List<String> values) {
addCriterion("description in", values, "description");
public Criteria andCompanyTelIn(List<String> values) {
addCriterion("company_tel in", values, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotIn(List<String> values) {
addCriterion("description not in", values, "description");
public Criteria andCompanyTelNotIn(List<String> values) {
addCriterion("company_tel not in", values, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionBetween(String value1, String value2) {
addCriterion("description between", value1, value2, "description");
public Criteria andCompanyTelBetween(String value1, String value2) {
addCriterion("company_tel between", value1, value2, "companyTel");
return (Criteria) this;
}
public Criteria andDescriptionNotBetween(String value1, String value2) {
addCriterion("description not between", value1, value2, "description");
public Criteria andCompanyTelNotBetween(String value1, String value2) {
addCriterion("company_tel not between", value1, value2, "companyTel");
return (Criteria) this;
}
public Criteria andCompanyFaxIsNull() {
addCriterion("company_fax is null");
return (Criteria) this;
}
public Criteria andCompanyFaxIsNotNull() {
addCriterion("company_fax is not null");
return (Criteria) this;
}
public Criteria andCompanyFaxEqualTo(String value) {
addCriterion("company_fax =", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotEqualTo(String value) {
addCriterion("company_fax <>", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxGreaterThan(String value) {
addCriterion("company_fax >", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxGreaterThanOrEqualTo(String value) {
addCriterion("company_fax >=", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLessThan(String value) {
addCriterion("company_fax <", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLessThanOrEqualTo(String value) {
addCriterion("company_fax <=", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxLike(String value) {
addCriterion("company_fax like", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotLike(String value) {
addCriterion("company_fax not like", value, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxIn(List<String> values) {
addCriterion("company_fax in", values, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotIn(List<String> values) {
addCriterion("company_fax not in", values, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxBetween(String value1, String value2) {
addCriterion("company_fax between", value1, value2, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyFaxNotBetween(String value1, String value2) {
addCriterion("company_fax not between", value1, value2, "companyFax");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIsNull() {
addCriterion("company_post_code is null");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIsNotNull() {
addCriterion("company_post_code is not null");
return (Criteria) this;
}
public Criteria andCompanyPostCodeEqualTo(String value) {
addCriterion("company_post_code =", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotEqualTo(String value) {
addCriterion("company_post_code <>", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeGreaterThan(String value) {
addCriterion("company_post_code >", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeGreaterThanOrEqualTo(String value) {
addCriterion("company_post_code >=", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLessThan(String value) {
addCriterion("company_post_code <", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLessThanOrEqualTo(String value) {
addCriterion("company_post_code <=", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeLike(String value) {
addCriterion("company_post_code like", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotLike(String value) {
addCriterion("company_post_code not like", value, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeIn(List<String> values) {
addCriterion("company_post_code in", values, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotIn(List<String> values) {
addCriterion("company_post_code not in", values, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeBetween(String value1, String value2) {
addCriterion("company_post_code between", value1, value2, "companyPostCode");
return (Criteria) this;
}
public Criteria andCompanyPostCodeNotBetween(String value1, String value2) {
addCriterion("company_post_code not between", value1, value2, "companyPostCode");
return (Criteria) this;
}
}

4
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View File

@@ -9,8 +9,10 @@ import java.util.List;
public interface SystemConfigMapperEx {
List<SystemConfig> selectByConditionSystemConfig(
@Param("companyName") String companyName,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsBySystemConfig();
Long countsBySystemConfig(
@Param("companyName") String companyName);
}

8
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java
View File

@@ -31,13 +31,17 @@ public class SystemConfigComponent implements ICommonQuery {
}
private List<?> getSystemConfigList(Map<String, String> map) {
String search = map.get(Constants.SEARCH);
String companyName = StringUtil.getInfo(search, "companyName");
String order = QueryUtils.order(map);
return systemConfigService.select(QueryUtils.offset(map), QueryUtils.rows(map));
return systemConfigService.select(companyName, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
public Long counts(Map<String, String> map) {
return systemConfigService.countSystemConfig();
String search = map.get(Constants.SEARCH);
String companyName = StringUtil.getInfo(search, "companyName");
return systemConfigService.countSystemConfig(companyName);
}
@Override

10
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
View File

@@ -33,12 +33,12 @@ public class SystemConfigService {
SystemConfigExample example = new SystemConfigExample();
return systemConfigMapper.selectByExample(example);
}
public List<SystemConfig> select(int offset, int rows) {
return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows);
public List<SystemConfig> select(String companyName, int offset, int rows) {
return systemConfigMapperEx.selectByConditionSystemConfig(companyName, offset, rows);
}
public Long countSystemConfig() {
return systemConfigMapperEx.countsBySystemConfig();
public Long countSystemConfig(String companyName) {
return systemConfigMapperEx.countsBySystemConfig(companyName);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -69,7 +69,7 @@ public class SystemConfigService {
public int checkIsNameExist(Long id, String name) {
SystemConfigExample example = new SystemConfigExample();
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name);
example.createCriteria().andIdNotEqualTo(id).andCompanyNameEqualTo(name);
List<SystemConfig> list = systemConfigMapper.selectByExample(example);
return list.size();
}

130
src/main/resources/mapper_xml/SystemConfigMapper.xml
View File

@@ -7,10 +7,12 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="company_name" jdbcType="VARCHAR" property="companyName" />
<result column="company_contacts" jdbcType="VARCHAR" property="companyContacts" />
<result column="company_address" jdbcType="VARCHAR" property="companyAddress" />
<result column="company_tel" jdbcType="VARCHAR" property="companyTel" />
<result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
<result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
@@ -83,7 +85,7 @@
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, type, name, value, description
id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
<!--
@@ -136,10 +138,12 @@
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_systemconfig (id, type, name,
value, description)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
insert into jsh_systemconfig (id, company_name, company_contacts,
company_address, company_tel, company_fax,
company_post_code)
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
#{companyPostCode,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
<!--
@@ -151,34 +155,46 @@
<if test="id != null">
id,
</if>
<if test="type != null">
type,
<if test="companyName != null">
company_name,
</if>
<if test="name != null">
name,
<if test="companyContacts != null">
company_contacts,
</if>
<if test="value != null">
value,
<if test="companyAddress != null">
company_address,
</if>
<if test="description != null">
description,
<if test="companyTel != null">
company_tel,
</if>
<if test="companyFax != null">
company_fax,
</if>
<if test="companyPostCode != null">
company_post_code,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
<if test="companyName != null">
#{companyName,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
<if test="companyContacts != null">
#{companyContacts,jdbcType=VARCHAR},
</if>
<if test="value != null">
#{value,jdbcType=VARCHAR},
<if test="companyAddress != null">
#{companyAddress,jdbcType=VARCHAR},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
<if test="companyTel != null">
#{companyTel,jdbcType=VARCHAR},
</if>
<if test="companyFax != null">
#{companyFax,jdbcType=VARCHAR},
</if>
<if test="companyPostCode != null">
#{companyPostCode,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -202,17 +218,23 @@
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
<if test="record.companyName != null">
company_name = #{record.companyName,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
<if test="record.companyContacts != null">
company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
</if>
<if test="record.value != null">
value = #{record.value,jdbcType=VARCHAR},
<if test="record.companyAddress != null">
company_address = #{record.companyAddress,jdbcType=VARCHAR},
</if>
<if test="record.description != null">
description = #{record.description,jdbcType=VARCHAR},
<if test="record.companyTel != null">
company_tel = #{record.companyTel,jdbcType=VARCHAR},
</if>
<if test="record.companyFax != null">
company_fax = #{record.companyFax,jdbcType=VARCHAR},
</if>
<if test="record.companyPostCode != null">
company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@@ -226,10 +248,12 @@
-->
update jsh_systemconfig
set id = #{record.id,jdbcType=BIGINT},
type = #{record.type,jdbcType=VARCHAR},
name = #{record.name,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR}
company_name = #{record.companyName,jdbcType=VARCHAR},
company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
company_address = #{record.companyAddress,jdbcType=VARCHAR},
company_tel = #{record.companyTel,jdbcType=VARCHAR},
company_fax = #{record.companyFax,jdbcType=VARCHAR},
company_post_code = #{record.companyPostCode,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -241,17 +265,23 @@
-->
update jsh_systemconfig
<set>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
<if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
<if test="companyContacts != null">
company_contacts = #{companyContacts,jdbcType=VARCHAR},
</if>
<if test="value != null">
value = #{value,jdbcType=VARCHAR},
<if test="companyAddress != null">
company_address = #{companyAddress,jdbcType=VARCHAR},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
<if test="companyTel != null">
company_tel = #{companyTel,jdbcType=VARCHAR},
</if>
<if test="companyFax != null">
company_fax = #{companyFax,jdbcType=VARCHAR},
</if>
<if test="companyPostCode != null">
company_post_code = #{companyPostCode,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -262,10 +292,12 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_systemconfig
set type = #{type,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR}
set company_name = #{companyName,jdbcType=VARCHAR},
company_contacts = #{companyContacts,jdbcType=VARCHAR},
company_address = #{companyAddress,jdbcType=VARCHAR},
company_tel = #{companyTel,jdbcType=VARCHAR},
company_fax = #{companyFax,jdbcType=VARCHAR},
company_post_code = #{companyPostCode,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

6
src/main/resources/mapper_xml/SystemConfigMapperEx.xml
View File

@@ -5,6 +5,9 @@
select *
FROM jsh_systemconfig
where 1=1
<if test="companyName != null">
and company_name like '%${companyName}%'
</if>
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -14,5 +17,8 @@
COUNT(id)
FROM jsh_systemconfig
WHERE 1=1
<if test="companyName != null">
and company_name like '%${companyName}%'
</if>
</select>
</mapper>

10
src/test/resources/generatorConfig.xml
View File

@@ -5,7 +5,7 @@
<generatorConfiguration>
<classPathEntry
location="C:\Users\cjl\.m2\repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/>
location="E:\maven-repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/>
<context id="DB2Tables" targetRuntime="MyBatis3" defaultModelType="flat">
<commentGenerator>
@@ -59,12 +59,12 @@
<table tableName="jsh_materialproperty" domainObjectName="MaterialProperty"></table>
<table tableName="jsh_person" domainObjectName="Person"></table>
<table tableName="jsh_role" domainObjectName="Role"></table>
<table tableName="jsh_supplier" domainObjectName="Supplier"></table>
<table tableName="jsh_supplier" domainObjectName="Supplier"></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_userbusiness" domainObjectName="UserBusiness"></table>-->
<!--<table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>-->
<table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table>
<table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>-->
<table tableName="jsh_organization" domainObjectName="Organization"></table>
<!--<table tableName="jsh_orga_user_rel" domainObjectName="OrgaUserRel"></table>-->
</context>