Skip to content
GitLab
Commit 3a0f0191 authored by 季圣华's avatar 季圣华
Browse files

重构-系统配置模块

parent 691b494c
Expand all Hide whitespace changes
Inline Side-by-side
erp_web/js/print/print.js
View file @ 3a0f0191
......@@ -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;
}
}
}
......
erp_web/pages/manage/systemConfig.html
View file @ 3a0f0191
This diff is collapsed.
sql/jsh_erp.sql
View file @ 3a0f0191
......@@ -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");
src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View file @ 3a0f0191
......@@ -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.company_name
*
* @mbggenerated
*/
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_name
*
* @param companyName the value for jsh_systemconfig.company_name
*
* @mbggenerated
*/
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.company_contacts
*
* @return the value of jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public String getCompanyContacts() {
return companyContacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_contacts
*
* @param companyContacts the value for jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
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.company_address
*
* @return the value of jsh_systemconfig.type
* @return the value of jsh_systemconfig.company_address
*
* @mbggenerated
*/
public String getType() {
return type;
public String getCompanyAddress() {
return companyAddress;
}
/**
* 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_address
*
* @param type the value for jsh_systemconfig.type
* @param companyAddress the value for jsh_systemconfig.company_address
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.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.name
* This method returns the value of the database column jsh_systemconfig.company_tel
*
* @return the value of jsh_systemconfig.name
* @return the value of jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public String getName() {
return name;
public String getCompanyTel() {
return companyTel;
}
/**
* 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_tel
*
* @param name the value for jsh_systemconfig.name
* @param companyTel the value for jsh_systemconfig.company_tel
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.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.value
* This method returns the value of the database column jsh_systemconfig.company_fax
*
* @return the value of jsh_systemconfig.value
* @return the value of jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public String getValue() {
return value;
public String getCompanyFax() {
return companyFax;
}
/**
* 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_fax
*
* @param value the value for jsh_systemconfig.value
* @param companyFax the value for jsh_systemconfig.company_fax
*
* @mbggenerated
*/
public void setValue(String value) {
this.value = value == null ? null : value.trim();
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.description
* This method returns the value of the database column jsh_systemconfig.company_post_code
*
* @return the value of jsh_systemconfig.description
* @return the value of jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public String getDescription() {
return description;
public String getCompanyPostCode() {
return companyPostCode;
}
/**
* 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_post_code
*
* @param description the value for jsh_systemconfig.description
* @param companyPostCode the value for jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
public void setCompanyPostCode(String companyPostCode) {
this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View file @ 3a0f0191
......@@ -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);
}
\ No newline at end of file
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java
View file @ 3a0f0191
......@@ -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
......
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
View file @ 3a0f0191
......@@ -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();
}
......
src/main/resources/mapper_xml/SystemConfigMapper.xml
View file @ 3a0f0191
......@@ -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="companyContacts != null">
#{companyContacts,jdbcType=VARCHAR},
</if>
<if test="companyAddress != null">
#{companyAddress,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
<if test="companyTel != null">
#{companyTel,jdbcType=VARCHAR},
</if>
<if test="value != null">
#{value,jdbcType=VARCHAR},
<if test="companyFax != null">
#{companyFax,jdbcType=VARCHAR},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
<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="companyContacts != null">
company_contacts = #{companyContacts,jdbcType=VARCHAR},
</if>
<if test="companyAddress != null">
company_address = #{companyAddress,jdbcType=VARCHAR},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
<if test="companyTel != null">
company_tel = #{companyTel,jdbcType=VARCHAR},
</if>
<if test="value != null">
value = #{value,jdbcType=VARCHAR},
<if test="companyFax != null">
company_fax = #{companyFax,jdbcType=VARCHAR},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
<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>
\ No newline at end of file
src/main/resources/mapper_xml/SystemConfigMapperEx.xml
View file @ 3a0f0191
......@@ -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>
\ No newline at end of file
src/test/resources/generatorConfig.xml
View file @ 3a0f0191
......@@ -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>
......
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