feature/dxf #269

Merged
dxfeng merged 2 commits from feature/dxf into develop 9 months ago

@ -42,7 +42,7 @@ import lombok.NoArgsConstructor;
public class ManagerDetachVO { public class ManagerDetachVO {
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;

@ -32,7 +32,7 @@ import lombok.NoArgsConstructor;
) )
public class EmployeeTableVO { public class EmployeeTableVO {
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
@OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname") @OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")

@ -2,6 +2,7 @@ package com.engine.organization.entity.hrmresource.vo;
import com.cloudstore.eccom.pc.table.WeaTableType; import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.organization.annotation.OrganizationTable; import com.engine.organization.annotation.OrganizationTable;
import com.engine.organization.annotation.OrganizationTableColumn;
import com.engine.organization.annotation.OrganizationTableOperate; import com.engine.organization.annotation.OrganizationTableOperate;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
@ -40,6 +41,6 @@ public class HrmResourceJclVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
} }

@ -45,7 +45,7 @@ public class HrmResourceVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**

@ -44,7 +44,7 @@ public class ScHrmResourceVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**

@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
primarykey = "id" primarykey = "id"
) )
public class JclImportHistoryDetailVO { public class JclImportHistoryDetailVO {
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
@OrganizationTableColumn(text = "行", width = "15%", column = "row_nums") @OrganizationTableColumn(text = "行", width = "15%", column = "row_nums")
private String rowNums; private String rowNums;

@ -37,7 +37,7 @@ import lombok.NoArgsConstructor;
) )
public class CardAccessVO { public class CardAccessVO {
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
@OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name",transmethod = "com.engine.organization.transmethod.CardAccessTrans.getMultiLanguage",multiLanguage = true) @OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name",transmethod = "com.engine.organization.transmethod.CardAccessTrans.getMultiLanguage",multiLanguage = true)

@ -43,7 +43,7 @@ public class PostInfoTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *

@ -43,12 +43,12 @@ public class GradeTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**
* *

@ -40,12 +40,12 @@ public class LevelTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**

@ -40,12 +40,12 @@ public class SchemeTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**

@ -47,12 +47,12 @@ public class SequenceTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**
* *

@ -41,7 +41,7 @@ public class StaffPlanTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**
* *

@ -33,12 +33,12 @@ public class StaffTableVO {
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
/** /**
* *
*/ */
//@OrganizationTableColumn(column = "isUsed", display = false) @OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed; private Integer isUsed;
/** /**
* id * id

Loading…
Cancel
Save