main
tamguo 7 years ago
parent 957dc48d0f
commit 526021e88e

@ -1,20 +0,0 @@
package com.tamguo.modules.sys.dao;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.plugins.pagination.Pagination;
import com.tamguo.config.dao.SuperMapper;
import com.tamguo.modules.sys.model.SysMenuEntity;
public interface SysMenuMapper extends SuperMapper<SysMenuEntity>{
List<SysMenuEntity> queryList(Map<String, Object> hashMap , Pagination page);
List<SysMenuEntity> queryNotButtonList();
SysMenuEntity queryByParentId(String parentId);
SysMenuEntity queryByUid(String uid);
}

@ -1,7 +1,6 @@
package com.tamguo.modules.sys.dao;
import java.util.List;
import com.baomidou.mybatisplus.plugins.pagination.Pagination;
import com.tamguo.config.dao.SuperMapper;
import com.tamguo.modules.sys.model.SysPostEntity;

@ -1,12 +0,0 @@
package com.tamguo.modules.sys.dao;
import java.util.List;
import com.baomidou.mybatisplus.plugins.pagination.Pagination;
import com.tamguo.config.dao.SuperMapper;
import com.tamguo.modules.sys.model.SysRoleEntity;
public interface SysRoleMapper extends SuperMapper<SysRoleEntity>{
List<SysRoleEntity> selectPageByName(SysRoleEntity sysRoleEntity, Pagination page);
}

@ -1,109 +0,0 @@
package com.tamguo.modules.sys.model;
import java.io.Serializable;
import java.util.List;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.config.dao.SuperEntity;
/**
* The persistent class for the reaps_sys_menu database table.
*
*/
@TableName(value="sys_menu")
public class SysMenuEntity extends SuperEntity<SysMenuEntity> implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private Integer orderNum;
private String parentId;
private Integer type;
private String url;
private String perms;
@TableField(exist=false)
private List<SysMenuEntity> menuList;
@TableField(exist=false)
private String parentName;
@TableField(exist=false)
private Boolean open;
public SysMenuEntity() {
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public Integer getOrderNum() {
return this.orderNum;
}
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
public String getParentId() {
return this.parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public Integer getType() {
return this.type;
}
public void setType(Integer type) {
this.type = type;
}
public String getUrl() {
return this.url;
}
public void setUrl(String url) {
this.url = url;
}
public List<SysMenuEntity> getMenuList() {
return menuList;
}
public void setMenuList(List<SysMenuEntity> menuList) {
this.menuList = menuList;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
public Boolean getOpen() {
return open;
}
public void setOpen(Boolean open) {
this.open = open;
}
public String getPerms() {
return perms;
}
public void setPerms(String perms) {
this.perms = perms;
}
}

@ -1,111 +1,247 @@
package com.tamguo.modules.sys.model;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.config.dao.SuperEntity;
import com.tamguo.modules.sys.model.enums.SysOfficeStatusEnum;
import com.tamguo.modules.sys.model.enums.SysOfficeTypeEnum;
@TableName(value="sys_office")
public class SysOfficeEntity extends SuperEntity<SysOfficeEntity> implements Serializable{
/**
* The persistent class for the sys_office database table.
*
*/
@TableName(value="sys_office")
public class SysOfficeEntity implements Serializable {
private static final long serialVersionUID = 1L;
private String parentId;
private String name;
private String fullName;
private String officeCode;
private Integer sorts;
private SysOfficeTypeEnum sysOfficeTypeEnum;
private String leader;
private String tel;
private String address;
private String zipCode;
private String corpCode;
private String corpName;
private String createBy;
private Date createDate;
private String email;
private String fullName;
private String leader;
private String officeName;
private String officeType;
private String parentCode;
private String parentCodes;
private String phone;
private String remarks;
private SysOfficeStatusEnum sysOfficeStatusEnum;
public String getParentId() {
return parentId;
private String status;
private String treeLeaf;
private BigDecimal treeLevel;
private String treeNames;
private BigDecimal treeSort;
private String treeSorts;
private String updateBy;
private Date updateDate;
private String viewCode;
private String zipCode;
public SysOfficeEntity() {
}
public void setParentId(String parentId) {
this.parentId = parentId;
public String getOfficeCode() {
return this.officeCode;
}
public String getName() {
return name;
public void setOfficeCode(String officeCode) {
this.officeCode = officeCode;
}
public void setName(String name) {
this.name = name;
public String getAddress() {
return this.address;
}
public String getFullName() {
return fullName;
public void setAddress(String address) {
this.address = address;
}
public void setFullName(String fullName) {
this.fullName = fullName;
public String getCorpCode() {
return this.corpCode;
}
public String getOfficeCode() {
return officeCode;
public void setCorpCode(String corpCode) {
this.corpCode = corpCode;
}
public void setOfficeCode(String officeCode) {
this.officeCode = officeCode;
public String getCorpName() {
return this.corpName;
}
public Integer getSorts() {
return sorts;
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getCreateBy() {
return this.createBy;
}
public void setSorts(Integer sorts) {
this.sorts = sorts;
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public SysOfficeTypeEnum getSysOfficeTypeEnum() {
return sysOfficeTypeEnum;
public Date getCreateDate() {
return this.createDate;
}
public void setSysOfficeTypeEnum(SysOfficeTypeEnum sysOfficeTypeEnum) {
this.sysOfficeTypeEnum = sysOfficeTypeEnum;
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public String getEmail() {
return this.email;
}
public void setEmail(String email) {
this.email = email;
}
public String getFullName() {
return this.fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getLeader() {
return leader;
return this.leader;
}
public void setLeader(String leader) {
this.leader = leader;
}
public String getTel() {
return tel;
public String getOfficeName() {
return this.officeName;
}
public void setTel(String tel) {
this.tel = tel;
public void setOfficeName(String officeName) {
this.officeName = officeName;
}
public String getAddress() {
return address;
public String getOfficeType() {
return this.officeType;
}
public void setAddress(String address) {
this.address = address;
public void setOfficeType(String officeType) {
this.officeType = officeType;
}
public String getZipCode() {
return zipCode;
public String getParentCode() {
return this.parentCode;
}
public void setZipCode(String zipCode) {
this.zipCode = zipCode;
public void setParentCode(String parentCode) {
this.parentCode = parentCode;
}
public String getEmail() {
return email;
public String getParentCodes() {
return this.parentCodes;
}
public void setEmail(String email) {
this.email = email;
public void setParentCodes(String parentCodes) {
this.parentCodes = parentCodes;
}
public String getPhone() {
return this.phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getRemarks() {
return remarks;
return this.remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public SysOfficeStatusEnum getSysOfficeStatusEnum() {
return sysOfficeStatusEnum;
public String getStatus() {
return this.status;
}
public void setStatus(String status) {
this.status = status;
}
public String getTreeLeaf() {
return this.treeLeaf;
}
public void setTreeLeaf(String treeLeaf) {
this.treeLeaf = treeLeaf;
}
public BigDecimal getTreeLevel() {
return this.treeLevel;
}
public void setTreeLevel(BigDecimal treeLevel) {
this.treeLevel = treeLevel;
}
public String getTreeNames() {
return this.treeNames;
}
public void setTreeNames(String treeNames) {
this.treeNames = treeNames;
}
public BigDecimal getTreeSort() {
return this.treeSort;
}
public void setTreeSort(BigDecimal treeSort) {
this.treeSort = treeSort;
}
public String getTreeSorts() {
return this.treeSorts;
}
public void setSysOfficeStatusEnum(SysOfficeStatusEnum sysOfficeStatusEnum) {
this.sysOfficeStatusEnum = sysOfficeStatusEnum;
public void setTreeSorts(String treeSorts) {
this.treeSorts = treeSorts;
}
public String getUpdateBy() {
return this.updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateDate() {
return this.updateDate;
}
public static long getSerialversionuid() {
return serialVersionUID;
}
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
public String getViewCode() {
return this.viewCode;
}
public void setViewCode(String viewCode) {
this.viewCode = viewCode;
}
public String getZipCode() {
return this.zipCode;
}
public void setZipCode(String zipCode) {
this.zipCode = zipCode;
}
}

@ -1,84 +1,131 @@
package com.tamguo.modules.sys.model;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.config.dao.SuperEntity;
import com.tamguo.modules.sys.model.enums.SysPostStatusEnum;
import com.tamguo.modules.sys.model.enums.SysPostTypeEnum;
@TableName(value="sys_post")
public class SysPostEntity extends SuperEntity<SysPostEntity> implements Serializable{
/**
* The persistent class for the sys_post database table.
*
*/
@TableName(value="sys_post")
public class SysPostEntity implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private String code;
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysPostTypeEnum postType;
private Integer sorts;
private String remarks;
private String postCode;
private String corpCode;
private String corpName;
private String createBy;
private Date createDate;
private Date updateDate;
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private String postName;
private BigDecimal postSort;
private String postType;
private String remarks;
private SysPostStatusEnum status;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
private String updateBy;
private Date updateDate;
public SysPostEntity() {
}
public void setCode(String code) {
this.code = code;
public String getPostCode() {
return this.postCode;
}
public SysPostTypeEnum getPostType() {
return postType;
public void setPostCode(String postCode) {
this.postCode = postCode;
}
public void setPostType(String postType) {
this.postType = SysPostTypeEnum.getPostType(postType);
public String getCorpCode() {
return this.corpCode;
}
public Integer getSorts() {
return sorts;
public void setCorpCode(String corpCode) {
this.corpCode = corpCode;
}
public void setSorts(Integer sorts) {
this.sorts = sorts;
public String getCorpName() {
return this.corpName;
}
public String getRemarks() {
return remarks;
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
public String getCreateBy() {
return this.createBy;
}
public static long getSerialversionuid() {
return serialVersionUID;
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateDate() {
return createDate;
return this.createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Date getUpdateDate() {
return updateDate;
public String getPostName() {
return this.postName;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
public void setPostName(String postName) {
this.postName = postName;
}
public BigDecimal getPostSort() {
return this.postSort;
}
public void setPostSort(BigDecimal postSort) {
this.postSort = postSort;
}
public String getPostType() {
return this.postType;
}
public void setPostType(String postType) {
this.postType = postType;
}
public String getRemarks() {
return this.remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public SysPostStatusEnum getStatus() {
return status;
return this.status;
}
public void setStatus(SysPostStatusEnum status) {
this.status = status;
}
}
public String getUpdateBy() {
return this.updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateDate() {
return this.updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
}

@ -1,52 +0,0 @@
package com.tamguo.modules.sys.model;
import java.io.Serializable;
import java.util.List;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.tamguo.config.dao.SuperEntity;
/**
* The persistent class for the reaps_sys_role database table.
*
*/
@TableName(value="sys_role")
public class SysRoleEntity extends SuperEntity<SysRoleEntity> implements Serializable {
private static final long serialVersionUID = 1L;
private String perms;
private String name;
@TableField(exist=false)
private List<String> menuIdList;
public SysRoleEntity() {
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public List<String> getMenuIdList() {
return menuIdList;
}
public void setMenuIdList(List<String> menuIdList) {
this.menuIdList = menuIdList;
}
public String getPerms() {
return perms;
}
public void setPerms(String perms) {
this.perms = perms;
}
}

@ -2,97 +2,104 @@ package com.tamguo.modules.sys.model.condition;
public class SysUserCondition {
private String companyCode;
private String companyName;
private Integer pageNo;
private Integer pageSize;
private String loginCode;
private String userName;
private String nickName;
private String name;
private String email;
private String mobile;
private String phone;
private String refName;
private String officeName;
private String officeCode;
private String companyCode;
private String companyName;
private String postCode;
private String status;
private Integer pageNo;
private Integer pageSize;
public Integer getPageNo() {
return pageNo;
}
public void setPageNo(Integer pageNo) {
this.pageNo = pageNo;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public String getLoginCode() {
return loginCode;
}
public void setLoginCode(String loginCode) {
this.loginCode = loginCode;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getRefName() {
return refName;
}
public void setRefName(String refName) {
this.refName = refName;
}
public String getOfficeName() {
return officeName;
}
public void setOfficeName(String officeName) {
this.officeName = officeName;
}
public String getOfficeCode() {
return officeCode;
}
public void setOfficeCode(String officeCode) {
this.officeCode = officeCode;
}
public String getCompanyCode() {
return companyCode;
}
public void setCompanyCode(String companyCode) {
this.companyCode = companyCode;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getNickName() {
return nickName;
public String getPostCode() {
return postCode;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
public void setPostCode(String postCode) {
this.postCode = postCode;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}

@ -1,21 +0,0 @@
package com.tamguo.modules.sys.service;
import java.util.List;
import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.modules.sys.model.SysRoleEntity;
public interface ISysRoleService {
public List<SysRoleEntity> findAll();
public Page<SysRoleEntity> queryList(SysRoleEntity role, Page<SysRoleEntity> page);
public SysRoleEntity select(String uid);
public void save(SysRoleEntity role);
public void update(SysRoleEntity role);
public void deleteBatch(String[] roleIds);
}

@ -37,12 +37,6 @@ public class PostServiceImpl extends ServiceImpl<SysPostMapper, SysPostEntity> i
@Transactional(readOnly=false)
@Override
public void update(SysPostEntity post) {
SysPostEntity entity = sysPostMapper.selectById(post.getId());
entity.setCode(post.getCode());
entity.setName(post.getName());
entity.setPostType(post.getPostType().getValue().toString());
entity.setRemarks(post.getRemarks());
entity.setSorts(post.getSorts());
post.setUpdateDate(new Date());
sysPostMapper.updateById(post);
}

@ -1,60 +0,0 @@
package com.tamguo.modules.sys.service.impl;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.tamguo.modules.sys.dao.SysRoleMapper;
import com.tamguo.modules.sys.model.SysRoleEntity;
import com.tamguo.modules.sys.service.ISysRoleService;
@Service
public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity> implements ISysRoleService{
@Autowired
private SysRoleMapper sysRoleMapper;
@Override
public List<SysRoleEntity> findAll() {
return sysRoleMapper.selectList(null);
}
@Transactional(readOnly=true)
@Override
public Page<SysRoleEntity> queryList(SysRoleEntity sysRoleEntity, Page<SysRoleEntity> page) {
List<SysRoleEntity> list = sysRoleMapper.selectPageByName(sysRoleEntity , page);
page.setRecords(list);
return page;
}
@Override
public SysRoleEntity select(String uid) {
return sysRoleMapper.selectById(uid);
}
@Transactional(readOnly=false)
@Override
public void save(SysRoleEntity role) {
role.setPerms(StringUtils.join(role.getMenuIdList(), ","));
sysRoleMapper.insert(role);
}
@Transactional(readOnly=false)
@Override
public void update(SysRoleEntity role) {
role.setPerms(StringUtils.join(role.getMenuIdList(), ","));
sysRoleMapper.updateById(role);
}
@Transactional(readOnly=false)
@Override
public void deleteBatch(String[] roleIds) {
sysRoleMapper.deleteBatchIds(Arrays.asList(roleIds));
}
}

@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.modules.sys.dao.SysUserMapper;
import com.tamguo.modules.sys.model.SysUserEntity;
@ -27,15 +26,6 @@ public class SysUserServiceImpl implements ISysUserService{
@Transactional(readOnly=false)
@Override
public Page<SysUserEntity> listData(SysUserCondition condition) {
if(!StringUtils.isEmpty(condition.getCompanyCode())) {
condition.setCompanyCode("%" + condition.getCompanyCode() + "%");
}
if(!StringUtils.isEmpty(condition.getName())) {
condition.setName("%" + condition.getName() + "%");
}
if(!StringUtils.isEmpty(condition.getNickName())) {
condition.setNickName("%" + condition.getNickName() + "%");
}
Page<SysUserEntity> page = new Page<>(condition.getPageNo() , condition.getPageSize());
return page.setRecords(sysUserMapper.listData(condition , page));
}

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tamguo.modules.sys.dao.SysMenuMapper">
<resultMap id="BaseResultMap" type="com.tamguo.modules.sys.model.SysMenuEntity" >
<id column="id" property="id" jdbcType="VARCHAR" />
<result column="parent_id" property="parentId" jdbcType="BIGINT" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="url" property="url" jdbcType="VARCHAR" />
<result column="type" property="type" jdbcType="INTEGER" />
<result column="perms" property="perms" jdbcType="INTEGER" />
<result column="order_num" property="orderNum" jdbcType="INTEGER" />
<result column="parentName" property="parentName" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, parent_id, name, url, type, perms , order_num
</sql>
<select id="queryList" resultMap="BaseResultMap">
select m.*,(select p.name from sys_menu p where p.uid = m.parent_id) as parentName
from sys_menu m order by m.order_num asc
</select>
<select id="queryNotButtonList" resultMap="BaseResultMap">
select <include refid="Base_Column_List" />
from sys_menu where type != 2 order by order_num asc
</select>
<select id="queryByUid" resultMap="BaseResultMap">
select m.*,(select p.name from sys_menu p where p.uid = m.parent_id) as parentName
from sys_menu m where m.uid = #{uid}
</select>
</mapper>

@ -4,29 +4,14 @@
<select id="listData" resultType="SysCompanyEntity">
SELECT
o.id,
o.parent_id,
o.name,
o.full_name,
o.office_code,
o.sorts,
o.office_type,
o.leader,
o.tel,
o.address,
o.zip_code,
o.email,
o.remarks,
o.`status`,
o.is_leaf,
o.tree_level
o.*
FROM
sys_office o
<where>
1 = 1
<choose>
<when test="parentCode != null and parentCode != ''">
and o.parent_id = #{parentCode}
and o.parent_code = #{parentCode}
</when>
<otherwise>
and o.tree_level = 0

@ -4,31 +4,11 @@
<select id="listData" resultType="SysPostEntity">
SELECT
p.id,
p. NAME,
p.`code`,
p.post_type,
p.sorts,
p.remarks,
p.create_date,
p.update_date,
p.status
p.*
FROM
sys_post p
<where>
1 = 1
<if test="code != null and code != ''">
and p.code = #{code}
</if>
<if test="name != null and name != ''">
and p.name like #{name}
</if>
<if test="postType != null and postType != ''">
and p.post_type like #{postType}
</if>
<if test="status != null and status != ''">
and p.status like #{status}
</if>
</where>
</select>

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tamguo.modules.sys.dao.SysRoleMapper">
<select id="selectPageByName" resultType="SysRoleEntity">
SELECT
r.id , r.name , r.perms
FROM
sys_role r
<where>
<if test="name!=null and name !=''">
t.name like #{name}
</if>
</where>
</select>
</mapper>

@ -82,12 +82,12 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
<script th:src="${setting.domain + 'common/common.js'}"></script>
<script>
// 初始化DataGrid对象
//初始化DataGrid对象
$('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'公司名称', name:'name', index:'a.name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '( '+row.id+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.id+'" class="btnList" data-title="编辑公司">'+(val||row.id)+'</a>';
{header:'公司名称', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '( '+row.viewCode+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.companyCode+'" class="btnList" data-title="编辑公司">'+(val||row.id)+'</a>';
}},
{header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
@ -95,16 +95,16 @@ $('#dataGrid').dataGrid({
{header:'更新时间', name:'updateDate', index:'a.update_date', width:200, align:"center"},
{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true);
return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","isRoot":true,"isTreeLeaf":true,"parentCode":"0"}], val, '未知', true);
}},
{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];
actions.push('<a href="'+ctx+'sys/company/detail?id='+row.id+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
actions.push('<a href="/js/a/sys/company/form?companyCode='+row.companyCode+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
if (row.status == Global.STATUS_NORMAL){
actions.push('<a href="/js/a/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="停用机构" data-confirm="确认要停用该机构吗?"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
actions.push('<a href="/js/a/sys/company/disable?companyCode='+row.companyCode+'" class="btnList" title="停用公司" data-confirm="确认要停用该公司吗?"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
}
if (row.status == Global.STATUS_DISABLE){
actions.push('<a href="/js/a/sys/office/enable?officeCode='+row.officeCode+'" class="btnList" title="启用机构" data-confirm="确认要启用该机构吗?"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
actions.push('<a href="/js/a/sys/company/enable?companyCode='+row.companyCode+'" class="btnList" title="启用公司" data-confirm="确认要启用该公司吗?"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
}
actions.push('<a href="/js/a/sys/company/delete?companyCode='+row.companyCode+'" class="btnList" title="删除公司" data-confirm="确认要删除该公司及所有子公司吗?" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
actions.push('<a href="/js/a/sys/company/form?parentCode='+row.id+'" class="btnList" title="新增下级公司"><i class="fa fa-plus-square"></i></a>&nbsp;');

@ -97,15 +97,19 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
$('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'机构名称', name:'name', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '( '+row.id+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.id+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
{header:'机构名称', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '( '+row.viewCode+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
}},
{header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
{header:'机构类型', name:'type', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
return "股份公司";
{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
{header:'机构类型', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel([{"id":"1019065443704786944","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"省级公司","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065443704786944","dictLabelOrig":"省级公司","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"1","dictLabel":"省级公司","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065443864170496","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"市级公司","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065443864170496","dictLabelOrig":"市级公司","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"2","dictLabel":"市级公司","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065444036136960","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"部门","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065444036136960","dictLabelOrig":"部门","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"3","dictLabel":"部门","isRoot":true,"isTreeLeaf":true,"parentCode":"0"}], val, '未知', true);
}},
{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","isRoot":true,"isTreeLeaf":true,"parentCode":"0"},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","isRoot":true,"isTreeLeaf":true,"parentCode":"0"}], val, '未知', true);
}},
{header:'操作', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];
actions.push('<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="编辑机构"><i class="fa fa-pencil"></i></a>&nbsp;');

@ -1,4 +1,3 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
@ -81,8 +80,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<label class="control-label">机构:</label>
<div class="control-inline width-90">
<div class="input-group treeselect" id="officeDiv" data-url="sys/office/treeData">
<input id="officeCode" type="hidden" name="employee.office.officeCode" value="" class="isReset"/>
<input id="officeName" type="text" name="employee.office.officeName" value=""
<input id="officeCode" type="hidden" name="officeCode" value="" class="isReset"/>
<input id="officeName" type="text" name="officeName" value=""
class="form-control " readonly="readonly"
/><span class="input-group-btn"><a id="officeButton" href="javascript:"
class="btn btn-default btn-sm"><i class="fa fa-search"></i></a>
@ -167,8 +166,8 @@ $("#officeButton,#officeName").click(function(){
<label class="control-label">公司:</label>
<div class="control-inline width-90">
<div class="input-group treeselect" id="companyDiv" data-url="sys/company/treeData">
<input id="companyCode" type="hidden" name="employee.company.companyCode" value="" class="isReset"/>
<input id="companyName" type="text" name="employee.company.companyName" value=""
<input id="companyCode" type="hidden" name="companyCode" value="" class="isReset"/>
<input id="companyName" type="text" name="companyName" value=""
class="form-control " readonly="readonly"
/><span class="input-group-btn"><a id="companyButton" href="javascript:"
class="btn btn-default btn-sm"><i class="fa fa-search"></i></a>
@ -287,6 +286,10 @@ $("#companyButton,#companyName").click(function(){
<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
<script th:src="${setting.domain + 'common/common.js'}"></script>
<!-- VUE -->
<script th:src="${setting.domain + 'vue/vue.min.js'}"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script>
// 初始化DataGrid对象
$('#dataGrid').dataGrid({
@ -370,7 +373,8 @@ $('#btnImport').click(function(){
});
});
</script>
<script id="importTpl" type="text/template">//<!--
<script id="importTpl" type="text/template">
//<!--
<form id="inputForm" action="/js/a/sys/empUser/importData" method="post" enctype="multipart/form-data"
class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
<div class="row">
@ -389,4 +393,5 @@ $('#btnImport').click(function(){
</div>
</div>
</form>
//--></script>
//-->
</script>
Loading…
Cancel
Save