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
2018-04-21 16:09:51 +08:00
parent 503e14b146
commit cc8da29107
33 changed files with 285 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/main/java/com/jeesite/modules/test/entity/TestData.java
View File

@@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_date", attrName="testDate", label="日期选择"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@Column(name="test_area_name", attrName="testAreaName", label="区域名称"),
@Column(includeEntity=DataEntity.class),
@@ -47,8 +47,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
}),
@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u11",
on="u11.office_code = a.test_office_code", columns={
@Column(name="office_code", label="部门编码", isPK=true),
@Column(name="office_name", label="部门名称", isQuery=false),
@Column(name="office_code", label="机构编码", isPK=true),
@Column(name="office_name", label="机构名称", isQuery=false),
}),
}, orderBy="a.update_date DESC"
)
@@ -64,7 +64,7 @@ public class TestData extends DataEntity<TestData> {
private Date testDate; // 日期选择
private Date testDatetime; // 日期时间
private User testUser; // 用户选择
private Office testOffice; // 部门选择
private Office testOffice; // 机构选择
private String testAreaCode; // 区域选择
private String testAreaName; // 区域名称
private List<TestDataChild> testDataChildList = ListUtils.newArrayList(); // 子表列表

8
web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
View File

@@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_date", attrName="testDate", label="日期选择"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@Column(name="test_area_name", attrName="testAreaName", label="区域名称", isQuery=false),
}, joinTable={
@@ -46,8 +46,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
}),
@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13",
on="u13.office_code = a.test_office_code", columns={
@Column(name="office_code", label="部门编码", isPK=true),
@Column(name="office_name", label="部门名称", isQuery=false),
@Column(name="office_code", label="机构编码", isPK=true),
@Column(name="office_name", label="机构名称", isQuery=false),
}),
}, orderBy="a.id ASC"
)
@@ -65,7 +65,7 @@ public class TestDataChild extends DataEntity<TestDataChild> {
private Date testDate; // 日期选择
private Date testDatetime; // 日期时间
private User testUser; // 用户选择
private Office testOffice; // 部门选择
private Office testOffice; // 机构选择
private String testAreaCode; // 区域选择
private String testAreaName; // 区域名称