liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '多语言支持' (#249) from feature/dxf into develop

Browse Source 
Reviewed-on: #249
pull/250/head^2
dxfeng 10 months ago
parent 750f23d603 0b6c0ae11e
commit b3c6f11626
17 changed files with 24 additions and 70 deletions
Show Stats Download Patch File Download Diff File

2
src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
Unescape Escape View File

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

3
src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java
Unescape Escape View File

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

2
src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
Unescape Escape View File

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

4
src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
Unescape Escape View File

@ -43,12 +43,12 @@ public class GradeTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

4
src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class LevelTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**

4
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class SchemeTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**

4
src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
Unescape Escape View File

@ -47,12 +47,12 @@ public class SequenceTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

4
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
Unescape Escape View File

@ -36,12 +36,12 @@ public class StaffPlanTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

4
src/com/engine/organization/entity/staff/vo/StaffTableVO.java
Unescape Escape View File

@ -33,12 +33,12 @@ public class StaffTableVO {
/**
* 主键
*/
@OrganizationTableColumn(column = "id", display = false)
//@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
@OrganizationTableColumn(column = "isUsed", display = false)
//@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 方案id

49
src/com/engine/organization/service/impl/ChartServiceImpl.java
Unescape Escape View File

@ -27,6 +27,7 @@ import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import weaver.hrm.resource.ResourceComInfo;
import weaver.systeminfo.SystemEnv;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -225,7 +226,7 @@ public class ChartServiceImpl extends Service implements ChartService {
//版本id
String versionId = Util.null2String(params.get("id"));
OrganizationAssert.isFalse(StringUtils.isBlank(rootId) || !rootId.startsWith("d_"), "数据有误,未查询到对应数据");
OrganizationAssert.isFalse(StringUtils.isBlank(rootId) || !rootId.startsWith("d_"), SystemEnv.getHtmlLabelName(547440,user.getLanguage()));
String departmentId = rootId.split("_")[1];
String detauleType = Util.null2String(params.get("detauleType"));
if (!"chart".equals(detauleType)) {
@ -1235,22 +1236,6 @@ public class ChartServiceImpl extends Service implements ChartService {
"department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " +
"versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
"?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
// while (rs.next()) {
// insertList = new ArrayList<>();
// insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid"));
// insertList.add(StringUtils.isBlank(rs.getString("managerid")) ? null : rs.getInt("managerid"));
// insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid"));
// insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid"));
// insertList.add(rs.getString("managerstr"));
// //insertList.add(rs.getString("virtualtype"));
// insertList.add(currentDate);
// insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId));
// insertParamList.add(insertList);
// }
// String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," +
// "departmentid,managerstr," +
// //"virtualtype," +
// "versiondate,versionid) values (?,?,?,?,?,?,?)";
insertData(recordSetTrans, insertVirtualHrmSql, insertParamList);
}
@ -1462,7 +1447,6 @@ public class ChartServiceImpl extends Service implements ChartService {
// 小于、等于所选层级元素展开
chartPO.setExpand(inDepth(selectDepth, chartPO.getDepartmentDepth()) ? "1" : "0");
filterAndAddData(currentList, chartPO, hideDepartment);
//currentList.add(chartPO);
}
@ -1539,35 +1523,6 @@ public class ChartServiceImpl extends Service implements ChartService {
* @return boolean 包含子元素：true,不包含子元素：false
*/
private Boolean getHasChildren(String fType, String fObjId) {
//String sql = "";
//if (StringUtils.isNotBlank(fType)) {
// switch (fType) {
// case "0":
// sql = "select id from " + SUB_COMPANY_TABLE + " where (supsubcomid is null or supsubcomid = '0') and companyid = '" + fObjId + "'";
// break;
// case "1":
// if (hasVirtualFields && !showVirtual) {
// sql = "select a.id from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (b.fblx is null or b.fblx != '1') and a.supsubcomid = '" + fObjId + "' union select a.id from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and (b.bmlx is null or b.bmlx != '1') and subcompanyid1 = '" + fObjId + "'";
// } else {
// sql = "select id from " + SUB_COMPANY_TABLE + " where (canceled is null or canceled != '1') and supsubcomid = '" + fObjId + "' union select id from " + DEPARTMENT_TABLE + " where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
// }
// break;
// case "2":
// if (hasVirtualFields && !showVirtual) {
// sql = "select a.id from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.supdepid = '" + fObjId + "'";
// } else {
// sql = "select id from " + DEPARTMENT_TABLE + " where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "'";
// }
// break;
// default:
// break;
// }
//}
//if (StringUtils.isNotBlank(sql)) {
// RecordSet rs = new RecordSet();
// rs.executeQuery(sql);
// return rs.next();
//}
return false;
}

2
src/com/engine/organization/service/impl/CompServiceImpl.java
Unescape Escape View File

@ -106,7 +106,7 @@ public class CompServiceImpl extends Service implements CompService {
OrganizationWeaTable<CompListDTO> table = new OrganizationWeaTable<>(user, CompListDTO.class);
List<Column> columns = pageInfos.getColumns();
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList());
table.setColumns(weaTableColumn);
WeaResultMsg result = new WeaResultMsg(false);
result.putAll(table.makeDataResult());

2
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
Unescape Escape View File

@ -159,7 +159,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
OrganizationWeaTable<DepartmentListDTO> table = new OrganizationWeaTable<>(user, DepartmentListDTO.class);
List<Column> columns = pageInfos.getColumns();
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList());
table.setColumns(weaTableColumn);

Write Preview
Loading…
Cancel
Save