manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改数据日志，差异化工具显示增强，人性化，通用化

Browse Source
This commit is contained in:
thinkgem
2021-01-19 22:17:21 +08:00
parent b1996130e6
commit 94ca59e025
12 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java
View File

@@ -21,7 +21,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2019-03-12
*/
@Table(name="${_prefix}sys_msg_inner", alias="a", columns={
@Table(name="${_prefix}sys_msg_inner", alias="a", label="内部消息", columns={
@Column(name="id", attrName="id", label="编号", isPK=true),
@Column(name="msg_title", attrName="msgTitle", label="消息标题", queryType=QueryType.LIKE),
@Column(name="content_level", attrName="contentLevel", label="内容等级", comment="内容等级（1普通 2一般 3紧急）"),

2
modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java
View File

@@ -20,7 +20,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2019-03-12
*/
@Table(name="${_prefix}sys_msg_inner_record", alias="a", columns={
@Table(name="${_prefix}sys_msg_inner_record", alias="a", label="消息发送记录", columns={
@Column(name="id", attrName="id", label="编号", isPK=true),
@Column(name="msg_inner_id", attrName="msgInnerId", label="所属消息"),
@Column(name="receive_user_code", attrName="receiveUserCode", label="接受者用户编码"),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java
View File

@@ -17,7 +17,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2017-03-22
*/
@Table(name="${_prefix}sys_area", alias="a", columns={
@Table(name="${_prefix}sys_area", alias="a", label="区域信息", columns={
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),
@Column(name="area_code", attrName="areaCode", label="区域代码", isPK=true),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
View File

@@ -28,7 +28,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2017-03-23
*/
@Table(name="${_prefix}sys_company", alias="a", columns={
@Table(name="${_prefix}sys_company", alias="a", label="公司信息", columns={
@Column(includeEntity=BaseEntity.class),
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
View File

@@ -25,7 +25,7 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
* @author ThinkGem
* @version 2017-03-25
*/
@Table(name="${_prefix}sys_user", alias="a", columns={
@Table(name="${_prefix}sys_user", alias="a", label="员工信息", columns={
@Column(includeEntity=User.class),
}, joinTable={
@JoinTable(type=Type.JOIN, entity=Employee.class, alias="e",

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
View File

@@ -24,7 +24,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2017-03-25
*/
@Table(name="${_prefix}sys_employee", alias="a", columns={
@Table(name="${_prefix}sys_employee", alias="a", label="员工信息", columns={
@Column(includeEntity=BaseEntity.class),
@Column(includeEntity=DataEntity.class),
@Column(name="emp_code", attrName="empCode", label="员工编码", isPK=true),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
View File

@@ -25,7 +25,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
* @author ThinkGem
* @version 2017-03-19
*/
@Table(name="${_prefix}sys_log", alias="a", columns={
@Table(name="${_prefix}sys_log", alias="a", label="操作日志", columns={
@Column(includeEntity=BaseEntity.class),
@Column(name="id", attrName="id", label="编码", isPK=true),
@Column(name="log_type", attrName="logType", label="日志类型"),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java
View File

@@ -23,7 +23,7 @@ import com.jeesite.modules.sys.utils.EmpUtils;
* @author ThinkGem
* @version 2017-03-23
*/
@Table(name="${_prefix}sys_office", alias="a", columns={
@Table(name="${_prefix}sys_office", alias="a", label="组织机构", columns={
@Column(includeEntity=BaseEntity.class),
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
View File

@@ -12,7 +12,7 @@ import com.jeesite.common.mybatis.annotation.Column;
import com.jeesite.common.mybatis.annotation.Table;
import com.jeesite.common.mybatis.mapper.query.QueryType;
@Table(name="${_prefix}sys_post", alias="a", columns={
@Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={
@Column(includeEntity=BaseEntity.class),
@Column(includeEntity=DataEntity.class),
@Column(name="post_code", attrName="postCode", label="岗位编码", isPK=true),

2
modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
View File

@@ -34,7 +34,7 @@ import com.jeesite.modules.bpm.entity.BpmEntity;
* @author ${functionAuthor}
* @version ${functionVersion}
*/
@Table(name="${table.genTableName}", alias="a", columns={
@Table(name="${table.genTableName}", alias="a", label="${functionNameSimple}信息", columns={
<%
var isBase = false, isData = false,
isTree = false, isExtend = false;

2
modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
View File

@@ -34,7 +34,7 @@ import com.jeesite.modules.bpm.entity.BpmEntity;
* @author ${functionAuthor}
* @version ${functionVersion}
*/
@Table(name="${table.genTableName}", alias="a", columns={
@Table(name="${table.genTableName}", alias="a", label="${functionNameSimple}信息", columns={
<%
var isBase = false, isData = false,
isTree = false, isExtend = false;

4
modules/core/src/main/resources/views/modules/sys/logForm.html
View File

@@ -184,6 +184,10 @@
</div>
</div>
<% } %>
<style>
table.table td {width:30%;vertical-align:middle!important;}
table.table th:first-child, table.table td:first-child {width:10%;}
</style>
<script>
$("#inputForm").validate({
submitHandler: function(form){