diff --git a/erp_web/js/print/print.js b/erp_web/js/print/print.js index e2bb9064..2465b50d 100644 --- a/erp_web/js/print/print.js +++ b/erp_web/js/print/print.js @@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) { if (res && res.code === 200) { if(res.data && res.data.page) { var array = res.data.page.rows; - for (var i = 0; i < array.length; i++) { - var name = array[i].name; - if (name === "company_name") { - companyName = array[i].value; - } + if(array.length > 0) { + var info = array[0]; + companyName = info.companyName; } } } diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html index df8e36df..d9da5789 100644 --- a/erp_web/pages/manage/systemConfig.html +++ b/erp_web/pages/manage/systemConfig.html @@ -16,128 +16,418 @@ - -
+ +
- - - + + - - - - - - - - - - - - - - - - - - - - + 查询   +
公司名称： - +
联系人：   - -
公司地址： - -
公司电话： - -
公司传真： - -
公司邮编： - -
- 保存信息 -
+ + +
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ 保存 + 取消 +
+ \ No newline at end of file diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index 823b5684..afe141c3 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -1308,4 +1308,22 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, -- ---------------------------- INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL); +-- ---------------------------- +-- 时间：2019年3月9日 +-- version：1.0.6 +-- 此次更新 +-- 整改jsh_systemconfig表的字段 +-- ---------------------------- +alter table jsh_systemconfig drop type; +alter table jsh_systemconfig drop name; +alter table jsh_systemconfig drop value; +alter table jsh_systemconfig drop description; +alter table jsh_systemconfig add company_name varchar(50) DEFAULT null COMMENT '公司名称'; +alter table jsh_systemconfig add company_contacts varchar(20) DEFAULT null COMMENT '公司联系人'; +alter table jsh_systemconfig add company_address varchar(50) DEFAULT null COMMENT '公司地址'; +alter table jsh_systemconfig add company_tel varchar(20) DEFAULT null COMMENT '公司电话'; +alter table jsh_systemconfig add company_fax varchar(20) DEFAULT null COMMENT '公司传真'; +alter table jsh_systemconfig add company_post_code varchar(20) DEFAULT null COMMENT '公司邮编'; +delete from jsh_systemconfig; +insert into jsh_systemconfig (`company_name`, `company_contacts`, `company_address`, `company_tel`, `company_fax`, `company_post_code`) values("南通jshERP公司","张三","南通市通州区某某路","0513-10101010","0513-18181818","226300"); diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx index 18855f4b..79ec6785 100644 Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ diff --git a/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 177a5153..a083073c 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -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(); } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index bf71a761..35efad8a 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -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 values) { - addCriterion("type in", values, "type"); + public Criteria andCompanyNameIn(List values) { + addCriterion("company_name in", values, "companyName"); return (Criteria) this; } - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); + public Criteria andCompanyNameNotIn(List 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 values) { - addCriterion("name in", values, "name"); + public Criteria andCompanyContactsIn(List values) { + addCriterion("company_contacts in", values, "companyContacts"); return (Criteria) this; } - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); + public Criteria andCompanyContactsNotIn(List 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 values) { - addCriterion("value in", values, "value"); + public Criteria andCompanyAddressIn(List values) { + addCriterion("company_address in", values, "companyAddress"); return (Criteria) this; } - public Criteria andValueNotIn(List values) { - addCriterion("value not in", values, "value"); + public Criteria andCompanyAddressNotIn(List 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 values) { - addCriterion("description in", values, "description"); + public Criteria andCompanyTelIn(List values) { + addCriterion("company_tel in", values, "companyTel"); return (Criteria) this; } - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); + public Criteria andCompanyTelNotIn(List 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 values) { + addCriterion("company_fax in", values, "companyFax"); + return (Criteria) this; + } + + public Criteria andCompanyFaxNotIn(List 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 values) { + addCriterion("company_post_code in", values, "companyPostCode"); + return (Criteria) this; + } + + public Criteria andCompanyPostCodeNotIn(List 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; } } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java index 041b697f..8ad32ced 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java @@ -9,8 +9,10 @@ import java.util.List; public interface SystemConfigMapperEx { List selectByConditionSystemConfig( + @Param("companyName") String companyName, @Param("offset") Integer offset, @Param("rows") Integer rows); - Long countsBySystemConfig(); + Long countsBySystemConfig( + @Param("companyName") String companyName); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java index e0becafd..65a6f771 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java @@ -31,13 +31,17 @@ public class SystemConfigComponent implements ICommonQuery { } private List getSystemConfigList(Map 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 map) { - return systemConfigService.countSystemConfig(); + String search = map.get(Constants.SEARCH); + String companyName = StringUtil.getInfo(search, "companyName"); + return systemConfigService.countSystemConfig(companyName); } @Override diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index ae492731..9b83bfb4 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -33,12 +33,12 @@ public class SystemConfigService { SystemConfigExample example = new SystemConfigExample(); return systemConfigMapper.selectByExample(example); } - public List select(int offset, int rows) { - return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows); + public List 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 list = systemConfigMapper.selectByExample(example); return list.size(); } diff --git a/src/main/resources/mapper_xml/SystemConfigMapper.xml b/src/main/resources/mapper_xml/SystemConfigMapper.xml index 4a128242..88381847 100644 --- a/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -7,10 +7,12 @@ 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 \ No newline at end of file diff --git a/src/test/resources/generatorConfig.xml b/src/test/resources/generatorConfig.xml index 78241a6a..9cba9eca 100644 --- a/src/test/resources/generatorConfig.xml +++ b/src/test/resources/generatorConfig.xml @@ -5,7 +5,7 @@ + location="E:\maven-repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/> @@ -59,12 +59,12 @@
-
+
-->
-
+ - +
+
-->