From 0b6c0ae11e1d204bd86f7709d6384530cdadb3ca Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 11 Jun 2024 09:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/detach/vo/ManagerDetachVO.java | 2 +- .../entity/employee/vo/EmployeeTableVO.java | 2 +- .../hrmresource/vo/HrmResourceJclVO.java | 3 +- .../entity/hrmresource/vo/HrmResourceVO.java | 2 +- .../hrmresource/vo/ScHrmResourceVO.java | 2 +- .../vo/JclImportHistoryDetailVO.java | 2 +- .../entity/personnelcard/vo/CardAccessVO.java | 2 +- .../entity/postion/vo/PostInfoTableVO.java | 2 +- .../entity/scheme/vo/GradeTableVO.java | 4 +- .../entity/scheme/vo/LevelTableVO.java | 4 +- .../entity/scheme/vo/SchemeTableVO.java | 4 +- .../entity/sequence/vo/SequenceTableVO.java | 4 +- .../entity/staff/vo/StaffPlanTableVO.java | 4 +- .../entity/staff/vo/StaffTableVO.java | 4 +- .../service/impl/ChartServiceImpl.java | 49 +------------------ .../service/impl/CompServiceImpl.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 2 +- 17 files changed, 24 insertions(+), 70 deletions(-) diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java index b86d2263..0eb3a290 100644 --- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -42,7 +42,7 @@ import lombok.NoArgsConstructor; public class ManagerDetachVO { - @OrganizationTableColumn(column = "id", display = false) + //@OrganizationTableColumn(column = "id", display = false) private Long id; diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 96895d8d..1aa76b92 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -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") diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java index 90f7b72f..b063dfd6 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java @@ -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; } diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index 3925f05c..2460bc26 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -45,7 +45,7 @@ public class HrmResourceVO { /** * 主键 */ - @OrganizationTableColumn(column = "id", display = false) + //@OrganizationTableColumn(column = "id", display = false) private Long id; /** diff --git a/src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java index 79b373c8..a2585d34 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java @@ -44,7 +44,7 @@ public class ScHrmResourceVO { /** * 主键 */ - @OrganizationTableColumn(column = "id", display = false) + //@OrganizationTableColumn(column = "id", display = false) private Long id; /** diff --git a/src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java b/src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java index 0ca8a7d6..add470ce 100644 --- a/src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java +++ b/src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java @@ -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; diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index eb218bea..27f101b2 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java @@ -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") diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index fb1875a4..8d10099c 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -43,7 +43,7 @@ public class PostInfoTableVO { /** * 主键 */ - @OrganizationTableColumn(column = "id", display = false) + //@OrganizationTableColumn(column = "id", display = false) private Long id; /** * 编号 diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index cc4c41de..b847c124 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -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; /** * 编号 diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java index 838e1221..9201ef36 100644 --- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -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; /** diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index e2f014b8..ff8eb9f0 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -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; /** diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index 84b77d2f..a42520e6 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -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; /** * 编号 diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 36119afa..94d41472 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -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; /** * 编号 diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 0f10fc8f..f63c2b7f 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -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 diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 4c093313..cccadf74 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -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; } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 331ff8ea..813ca555 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -106,7 +106,7 @@ public class CompServiceImpl extends Service implements CompService { OrganizationWeaTable table = new OrganizationWeaTable<>(user, CompListDTO.class); List columns = pageInfos.getColumns(); - List weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList()); + List 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()); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 9f60521c..7f77a8e5 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -159,7 +159,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService OrganizationWeaTable table = new OrganizationWeaTable<>(user, DepartmentListDTO.class); List columns = pageInfos.getColumns(); - List weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList()); + List weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList()); table.setColumns(weaTableColumn); -- 2.40.0.windows.1