From f51fd4713e3ddd6ff57960ffd7490a61c59bc46c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 31 May 2024 11:34:09 +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 --- .../service/impl/JobBrowserService.java | 4 +- .../organization/annotation/TableTitle.java | 1 + .../entity/company/dto/CompListDTO.java | 7 +- .../department/dto/DepartmentListDTO.java | 6 +- .../department/vo/SingleDeptTreeVO.java | 2 +- .../entity/detach/vo/ManagerDetachVO.java | 4 +- .../vo/JclOrgCustomTemplateVO.java | 67 ------------------- .../hrmresource/vo/ResourceBasicInfoVO.java | 8 +-- .../entity/job/dto/JobListDTO.java | 4 +- .../entity/job/vo/JobBrowserVO.java | 6 +- .../entity/job/vo/SingleJobTreeVO.java | 2 +- .../entity/personnelcard/vo/CardAccessVO.java | 2 +- .../entity/postion/vo/PostInfoTableVO.java | 10 +-- .../entity/scheme/vo/GradeTableVO.java | 16 ++--- .../entity/scheme/vo/LevelTableVO.java | 14 ++-- .../entity/sequence/vo/SequenceTableVO.java | 14 ++-- .../entity/staff/vo/StaffPlanTableVO.java | 10 +-- .../entity/staff/vo/StaffTableVO.java | 4 +- .../service/impl/CardAccessServiceImpl.java | 3 +- .../service/impl/CompServiceImpl.java | 4 +- .../service/impl/DepartmentServiceImpl.java | 4 +- .../service/impl/GradeServiceImpl.java | 26 +++---- .../service/impl/HrmResourceServiceImpl.java | 3 +- .../service/impl/JobServiceImpl.java | 6 +- .../service/impl/LevelServiceImpl.java | 26 +++---- .../service/impl/PostInfoServiceImpl.java | 10 +-- .../service/impl/PostServiceImpl.java | 6 +- .../service/impl/QuickSearchServiceImpl.java | 4 +- .../impl/ResourceBasicInfoServiceImpl.java | 14 ++-- .../service/impl/SequenceServiceImpl.java | 20 +++--- .../service/impl/StaffPlanServiceImpl.java | 14 ++-- .../service/impl/StaffServiceImpl.java | 4 +- .../engine/organization/util/page/Column.java | 4 +- .../organization/util/page/PageInfo.java | 3 +- .../util/response/ResultCode.java | 29 +++++--- .../util/response/ReturnResult.java | 15 +++++ .../organization/web/SchemeController.java | 18 ++--- 37 files changed, 178 insertions(+), 216 deletions(-) delete mode 100644 src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index ccd216d1..b1e0f003 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -118,9 +118,9 @@ public class JobBrowserService extends BrowserService { Map> apiDatas = new HashMap<>(); List conditions = new ArrayList<>(); // 编号 - SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "jobNo"); + SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "jobNo"); // 名称 - SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobName"); + SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "jobName"); // 所属分部 SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", ""); // 所属部门 diff --git a/src/com/engine/organization/annotation/TableTitle.java b/src/com/engine/organization/annotation/TableTitle.java index aff2bf9a..7047acbc 100644 --- a/src/com/engine/organization/annotation/TableTitle.java +++ b/src/com/engine/organization/annotation/TableTitle.java @@ -7,6 +7,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented public @interface TableTitle { + int labelId() default -1; String title(); String dataIndex(); String key(); diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index d1d5b05a..b04b7a84 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -2,7 +2,6 @@ package com.engine.organization.entity.company.dto; import com.engine.organization.annotation.OrganizationTable; import com.engine.organization.annotation.TableTitle; -import com.engine.organization.entity.department.dto.DepartmentListDTO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -35,13 +34,13 @@ public class CompListDTO { /** * 名称 */ - @TableTitle(title = "名称", dataIndex = "subCompanyDesc", key = "subCompanyDesc") + @TableTitle(labelId = 547141, title = "名称", dataIndex = "subCompanyDesc", key = "subCompanyDesc") private String subCompanyDesc; /** * 编号 */ - @TableTitle(title = "编号", dataIndex = "subCompanyCode", key = "subCompanyCode") + @TableTitle(labelId = 547118, title = "编号", dataIndex = "subCompanyCode", key = "subCompanyCode") private String subCompanyCode; /** @@ -65,7 +64,7 @@ public class CompListDTO { /** * 禁用标记 */ - @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled") + @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled") private Integer canceled; /** diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index cbb078c5..99fccf05 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -36,13 +36,13 @@ public class DepartmentListDTO { /** * 名称 */ - @TableTitle(title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200") + @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200") private String departmentMark; /** * 编号 */ - @TableTitle(title = "编号", dataIndex = "departmentCode", key = "departmentCode") + @TableTitle(labelId = 547118, title = "编号", dataIndex = "departmentCode", key = "departmentCode") private String departmentCode; /** @@ -82,7 +82,7 @@ public class DepartmentListDTO { /** * 禁用标记 */ - @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled") + @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled") private int canceled; /** * 操作列 diff --git a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java index d6fbed46..44ccb1fc 100644 --- a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java +++ b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java @@ -26,7 +26,7 @@ public class SingleDeptTreeVO { private Integer id; - @TableTitle(title = "编号", dataIndex = "departmentCode", key = "departmentCode") + @TableTitle(labelId = 547118, title = "编号", dataIndex = "departmentCode", key = "departmentCode") private String departmentCode; @TableTitle(title = "部门名称", dataIndex = "departmentMark", key = "departmentMark") diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java index 09eb15f4..b86d2263 100644 --- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -34,8 +34,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(index = "0", text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX ) diff --git a/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java b/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java deleted file mode 100644 index f5bbbd1c..00000000 --- a/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java +++ /dev/null @@ -1,67 +0,0 @@ -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; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@OrganizationTable(pageId = "8df45b09-0cda-4f57-a93a-ca9f96a4c111", - fields = "t.id," + - "t.name," + - "t.basic_fields," + - "t.personal_fields," + - "t.work_fields," + - "t.isused," + - "t.creator," + - "t.create_time," + - "t.update_time", - fromSql = "FROM jcl_org_custom_template t ", - orderby = "id", - sortway = "asc", - primarykey = "id", - operates = { - @OrganizationTableOperate(index = "0", text = "编辑"), - @OrganizationTableOperate(index = "1", text = "另存为"), - @OrganizationTableOperate(index = "2", text = "删除") - }, - tableType = WeaTableType.CHECKBOX -) -public class JclOrgCustomTemplateVO { - - @OrganizationTableColumn(column = "id", display = false) - private Integer id; - - @OrganizationTableColumn(text = "模板名称", width = "30%", column = "name") - private String name; - - @OrganizationTableColumn(column = "basic_fields", display = false) - private String basicFields; - - @OrganizationTableColumn(column = "personal_fields", display = false) - private String personalFields; - - @OrganizationTableColumn(column = "work_fields", display = false) - private String workFields; - - @OrganizationTableColumn(column = "isused", display = false) - private Integer isUsed; - - @OrganizationTableColumn(column = "creator", display = false) - private Integer creator; - - @OrganizationTableColumn(text = "创建时间",column = "create_time", width = "30%") - private Date createTime; - - @OrganizationTableColumn(text = "更新时间",column = "update_time", display = false) - private Date updateTime; -} diff --git a/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java index abf878d6..8b52c46d 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java @@ -32,8 +32,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "fid", operates = { - @OrganizationTableOperate(index = "0", text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"), @OrganizationTableOperate(index = "2", text = "恢复") }, tableType = WeaTableType.CHECKBOX, @@ -54,13 +54,13 @@ public class ResourceBasicInfoVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "fno", orderkey = "fno") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "fno", orderkey = "fno") private String fNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "fname") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "fname") private String fName; /** diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 5a27050a..aff5cd52 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -34,12 +34,12 @@ public class JobListDTO { /** * 名称 */ - @TableTitle(title = "名称", dataIndex = "jobTitleName", key = "jobTitleName", width = "150") + @TableTitle(labelId = 547141, title = "名称", dataIndex = "jobTitleName", key = "jobTitleName", width = "150") private String jobTitleName; /** * 编号 */ - @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo") + @TableTitle(labelId = 547118, title = "编号", dataIndex = "jobNo", key = "jobNo") private String jobNo; /** * 所属分部 diff --git a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java index 9404f807..fe663bd7 100644 --- a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java +++ b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java @@ -28,8 +28,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(index = "0", text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX ) @@ -38,7 +38,7 @@ public class JobBrowserVO { @OrganizationTableColumn(text = "标识", width = "25%", column = "id", display = false) private Long id; - @OrganizationTableColumn(text = "编号", width = "25%", column = "job_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "25%", column = "job_no") private String jobNo; @OrganizationTableColumn(text = "岗位名称", width = "25%", column = "name") diff --git a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java index fc15471b..8d94d85a 100644 --- a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java +++ b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java @@ -26,7 +26,7 @@ public class SingleJobTreeVO { private Long id; - @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo") + @TableTitle(labelId = 547118, title = "编号", dataIndex = "jobNo", key = "jobNo") private String jobNo; @TableTitle(title = "岗位名称", dataIndex = "jobName", key = "jobName") diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index cdefeff7..7a1586fa 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java @@ -43,7 +43,7 @@ public class CardAccessVO { @OrganizationTableColumn(text = "栏目", width = "15%", column = "type_name") private Integer typeName; - @OrganizationTableColumn(text = "是否启用", width = "15%", column = "status") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "15%", column = "status") private Integer status; @OrganizationTableColumn(text = "所有人可见", width = "15%", column = "all_people") diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index b5213ea9..fb1875a4 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -33,8 +33,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(index = "0", text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX, operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"), checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used") @@ -48,12 +48,12 @@ public class PostInfoTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no") private String postInfoNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "post_info_name") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "post_info_name") private String postInfoName; /** * 权限 @@ -84,6 +84,6 @@ public class PostInfoTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index 127687e8..cc4c41de 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -31,8 +31,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX, operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"), @@ -53,12 +53,12 @@ public class GradeTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no") private String gradeNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "grade_name") private String gradeName; /** @@ -68,22 +68,22 @@ public class GradeTableVO { /** * 等级方案 */ - @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + @OrganizationTableColumn( labelId = 547124, text = "等级方案", width = "20%", column = "scheme_name") private String schemeName; /** * 职等 */ - @OrganizationTableColumn(text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId") + @OrganizationTableColumn(labelId = 547139, text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId") private String levelId; /** * 描述说明 */ - @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description") + @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description") private String description; /** * 禁用标记 */ - @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag") private int forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java index 548af929..838e1221 100644 --- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -30,8 +30,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX, operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"), checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used") @@ -51,30 +51,30 @@ public class LevelTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "level_no", orderkey = "level_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "level_no", orderkey = "level_no") private String levelNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "level_name") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "level_name") private String levelName; /** * 等级方案 */ - @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + @OrganizationTableColumn(text = "等级方案", labelId = 547124, width = "20%", column = "scheme_name") private String schemeName; /** * 描述说明 */ - @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description") + @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description") private String description; /** * 禁用标记 */ - @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index 47f8ec35..84b77d2f 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -34,8 +34,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX, operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"), @@ -57,30 +57,30 @@ public class SequenceTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no") private String sequenceNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "sequence_name") private String sequenceName; /** * 等级方案 */ - @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + @OrganizationTableColumn(text = "等级方案", labelId = 547124, width = "20%", column = "scheme_name") private String schemeName; /** * 描述说明 */ - @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description") + @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description") private String description; /** * 禁用标记 */ - @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 02381c89..ae72c035 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -24,8 +24,8 @@ import lombok.NoArgsConstructor; sortway = "asc", primarykey = "id", operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除") + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除") }, tableType = WeaTableType.CHECKBOX, operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:is_used"), checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used") @@ -46,12 +46,12 @@ public class StaffPlanTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "16%", column = "plan_no", orderkey = "plan_no") + @OrganizationTableColumn(labelId = 547118, text = "编号", width = "16%", column = "plan_no", orderkey = "plan_no") private String planNo; /** * 名称 */ - @OrganizationTableColumn(text = "名称", width = "16%", column = "plan_name") + @OrganizationTableColumn(labelId = 547141, text = "名称", width = "16%", column = "plan_name") private String planName; /** * w维度 @@ -76,7 +76,7 @@ public class StaffPlanTableVO { /** * 状态 */ - @OrganizationTableColumn(text = "是否启用", width = "16%", column = "forbidden_tag") + @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "16%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 4e2e5e0f..05f4c52b 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -23,8 +23,8 @@ import lombok.NoArgsConstructor; orderby = "id desc", primarykey = "id", operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), + @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"), + @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"), @OrganizationTableOperate(index = "2", text = "变更") }, tableType = WeaTableType.CHECKBOX diff --git a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java index f12e9811..e9b7273c 100644 --- a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java +++ b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.general.Util; +import weaver.systeminfo.SystemEnv; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -102,7 +103,7 @@ public class CardAccessServiceImpl extends Service implements CardAccessService public Map getCardButtonTable() { List infoPOList = new ArrayList<>(); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build()); - infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc("启用").fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); + infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build()); diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index ab1914c2..39aa5d8d 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -178,9 +178,9 @@ public class CompServiceImpl extends Service implements CompService { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); // 编号 - SearchConditionItem subCompanyCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "subCompanyCode"); + SearchConditionItem subCompanyCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "subCompanyCode"); // 名称 - SearchConditionItem subCompanyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "subCompanyDesc"); + SearchConditionItem subCompanyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "subCompanyDesc"); // 简称 SearchConditionItem subCompanyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "subCompanyName"); // 上级公司 diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 8665ddb2..2c9602cf 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -231,9 +231,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); // 编号 - SearchConditionItem departmentCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "departmentCode"); + SearchConditionItem departmentCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "departmentCode"); // 名称 - SearchConditionItem departmentNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "departmentName"); + SearchConditionItem departmentNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "departmentName"); // 所属分部 SearchConditionItem subCompanyId1Item = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subCompanyId1", ""); // 上级部门 diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index 3da96528..03d33343 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -75,7 +75,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int saveGrade(GradeSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getGradeNo(), null), "同一等级方案下编号不能重复"); + OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getGradeNo(), null), SystemEnv.getHtmlLabelName(547177, user.getLanguage())); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); return getGradeMapper().insertIgnoreNull(gradePO); } @@ -84,7 +84,7 @@ public class GradeServiceImpl extends Service implements GradeService { public int updateGrade(GradeSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); - OrganizationAssert.isTrue(checkRepeatNo(gradePO.getSchemeId(), gradePO.getGradeNo(), gradePO.getId()), "同一等级方案下编号不能重复"); + OrganizationAssert.isTrue(checkRepeatNo(gradePO.getSchemeId(), gradePO.getGradeNo(), gradePO.getId()), SystemEnv.getHtmlLabelName(547177, user.getLanguage())); return getGradeMapper().updateGrade(gradePO); } @@ -98,7 +98,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getGradeMapper().deleteByIds(ids); } @@ -108,8 +108,8 @@ public class GradeServiceImpl extends Service implements GradeService { Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser"); - SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "gradeName"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser"); + SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "gradeName"); conditionItems.add(browserItem); conditionItems.add(gradeNameCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); @@ -126,12 +126,12 @@ public class GradeServiceImpl extends Service implements GradeService { List addGroups = new ArrayList<>(); String id = Util.null2String(params.get("id")); String schemeId = Util.null2String(params.get("schemeId")); - SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "gradeName"); + SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "gradeName"); gradeNameCondition.setRules("required|string"); - SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo"); + SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "gradeNo"); gradeNoCondition.setRules("required|string"); - SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description"); - SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); + SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description"); + SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser"); schemeBrowserItem.setRules("required|string"); BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam(); if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) { @@ -140,7 +140,7 @@ public class GradeServiceImpl extends Service implements GradeService { schemeBrowserBean.setReplaceDatas(maps); schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean); } - SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "162", "levelId", "LevelBrowser"); + SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547139, "162", "levelId", "LevelBrowser"); levelBrowserItem.setRules("required|string"); // 编辑状态下赋值操作 @@ -206,9 +206,9 @@ public class GradeServiceImpl extends Service implements GradeService { public Map getTabInfo() { Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); - topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); - topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build()); - topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build()); + topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191, user.getLanguage())).viewCondition("-1").build()); + topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).viewCondition("0").build()); + topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build()); apiDatas.put("topTabs", topTabs); HashMap countMap = new HashMap<>(); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 4560fd26..b8f43f29 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -62,6 +62,7 @@ import weaver.general.StringUtil; import weaver.general.TimeUtil; import weaver.general.Util; import weaver.hrm.definedfield.HrmFieldManager; +import weaver.systeminfo.SystemEnv; import java.math.BigDecimal; import java.math.RoundingMode; @@ -1314,7 +1315,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic List options = searchConditionItem.getOptions(); SearchConditionOption searchConditionOption = new SearchConditionOption(); searchConditionOption.setKey("-1"); - searchConditionOption.setShowname("全部"); + searchConditionOption.setShowname(SystemEnv.getHtmlLabelName(547191,user.getLanguage())); options.add(0, searchConditionOption); options.forEach(item -> item.setSelected(false)); } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 148fb144..ff4e9c6e 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -222,9 +222,9 @@ public class JobServiceImpl extends Service implements JobService { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); // 编号 - SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "jobNo"); + SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "jobNo"); // 名称 - SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobTitleName"); + SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "jobTitleName"); // 所属分部 SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subcompanyid1", ""); // 所属部门 @@ -499,7 +499,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); List jobsByIds = getJobMapper().getJobsByIds(ids); for (JobPO jobsById : jobsByIds) { // 判断是否可以删除 diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 55038b09..44c41dcf 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -72,7 +72,7 @@ public class LevelServiceImpl extends Service implements LevelService { public int saveLevel(LevelSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo())); - OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getLevelNo(), null), "同一等级方案下编号不能重复"); + OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getLevelNo(), null), SystemEnv.getHtmlLabelName(547177, user.getLanguage())); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); return getLevelMapper().insertIgnoreNull(levelPO); } @@ -81,7 +81,7 @@ public class LevelServiceImpl extends Service implements LevelService { public int updateLevel(LevelSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); - OrganizationAssert.isTrue(checkRepeatNo(levelPO.getSchemeId(), levelPO.getLevelNo(), levelPO.getId()), "同一等级方案下编号不能重复"); + OrganizationAssert.isTrue(checkRepeatNo(levelPO.getSchemeId(), levelPO.getLevelNo(), levelPO.getId()), SystemEnv.getHtmlLabelName(547177, user.getLanguage())); return getLevelMapper().updateLevel(levelPO); } @@ -95,7 +95,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getLevelMapper().deleteByIds(ids); } @@ -105,8 +105,8 @@ public class LevelServiceImpl extends Service implements LevelService { Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser"); - SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "levelName"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser"); + SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "levelName"); conditionItems.add(browserItem); conditionItems.add(levelNameCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); @@ -123,12 +123,12 @@ public class LevelServiceImpl extends Service implements LevelService { List addGroups = new ArrayList<>(); String id = Util.null2String(params.get("id")); String schemeId = Util.null2String(params.get("schemeId")); - SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "levelName"); + SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "levelName"); levelNameCondition.setRules("required|string"); - SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo"); + SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "levelNo"); levelNoCondition.setRules("required|string"); - SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description"); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); + SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser"); BrowserBean browserBean = browserItem.getBrowserConditionParam(); if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) { browserItem.setValue(schemeId); @@ -173,9 +173,9 @@ public class LevelServiceImpl extends Service implements LevelService { public Map getTabInfo() { Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); - topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); - topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build()); - topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build()); + topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191, user.getLanguage())).viewCondition("-1").build()); + topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).viewCondition("0").build()); + topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build()); apiDatas.put("topTabs", topTabs); HashMap countMap = new HashMap<>(); @@ -190,7 +190,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public TreeData getTreeData() { ArrayList treeDataList = getLevelMapper().getTreeData(); - return TreeData.builder().children(treeDataList).title("职等").key("-1").build(); + return TreeData.builder().children(treeDataList).title(SystemEnv.getHtmlLabelName(547139, user.getLanguage())).key("-1").build(); } /** diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 711c27e8..5ded424a 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -136,7 +136,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getPostInfoMapper().deleteByIds(ids); } @@ -147,7 +147,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "职务分类", "161", "postId", "postBrowser"); - SearchConditionItem nameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "postInfoName"); + SearchConditionItem nameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "postInfoName"); conditionItems.add(browserItem); conditionItems.add(nameCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); @@ -163,10 +163,10 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); // 编号 - SearchConditionItem noItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "postInfoNo"); + SearchConditionItem noItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "postInfoNo"); noItem.setRules("required|string"); // 名称 - SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postInfoName"); + SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "postInfoName"); nameItem.setRules("required|string"); // 权限 SearchConditionItem authorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 0, "权限", "postInfoAuthority"); @@ -178,7 +178,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser"); postIdBrowser.setRules("required|string"); // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description"); // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 5b278d7a..198d9a93 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -49,7 +49,7 @@ public class PostServiceImpl extends Service implements PostService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getPostMapper().deleteByIds(ids); } @@ -59,9 +59,9 @@ public class PostServiceImpl extends Service implements PostService { Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); - SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName"); + SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "postName"); postNameItem.setRules("required|string"); - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description"); // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); diff --git a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java index 3aa3d0eb..5a69e9eb 100644 --- a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java +++ b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java @@ -71,7 +71,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic } else { // 字段本身值、判断有无下拉框选项 List options = selectOptions.stream().map(item -> ConditionOption.builder().key(item.getKey()).showname(item.getShowname()).build()).collect(Collectors.toList()); - options.add(0,ConditionOption.builder().key("-1").showname("全部").build()); + options.add(0,ConditionOption.builder().key("-1").showname(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).build()); condition.setOptions(options); } rangeConditions.add(condition); @@ -105,7 +105,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic condition.setCom("未设置选项"); } else { List collect = quickSearchDetailList.stream().map(item -> ConditionOption.builder().key(item.getId().toString()).showname(item.getCustomName()).build()).collect(Collectors.toList()); - collect.add(0,ConditionOption.builder().key("-1").showname("全部").build()); + collect.add(0,ConditionOption.builder().key("-1").showname(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).build()); condition.setOptions(collect); } rangeConditions.add(condition); diff --git a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java index 8b1a7605..d77d9e0c 100644 --- a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java @@ -96,9 +96,9 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas resourceTypeItem.setBrowserConditionParam(browserBean); } - SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno"); + SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "fno"); fNo.setRules("required|string"); - SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname"); + SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "fname"); fName.setRules("required|string"); SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo"); @@ -126,7 +126,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas @Override public int deletByIds(Collection ids) { - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getResourceBasicInfoMapper().deleteByIds(ids); } @@ -158,9 +158,9 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas String id = Util.null2String(params.get("fid")); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); - SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno"); + SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "fno"); fNo.setRules("required|string"); - SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname"); + SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "fname"); fName.setRules("required|string"); SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo"); @@ -212,8 +212,8 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas public List getSearchCondition() { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "fname"); - SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "fno"); + SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "fname"); + SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "fno"); conditionItems.add(schemeNameCondition); conditionItems.add(schemeNoCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index a0149fd3..194897f4 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -139,7 +139,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getSequenceMapper().deleteByIds(ids); } @@ -149,8 +149,8 @@ public class SequenceServiceImpl extends Service implements SequenceService { Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser"); - SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "sequenceName"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser"); + SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "sequenceName"); conditionItems.add(browserItem); conditionItems.add(sequenceNameCondition); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); @@ -165,12 +165,12 @@ public class SequenceServiceImpl extends Service implements SequenceService { Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); - SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "sequenceName"); + SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "sequenceName"); sequenceNameCondition.setRules("required|string"); - SearchConditionItem sequenceNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "sequenceNo"); + SearchConditionItem sequenceNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "sequenceNo"); sequenceNoCondition.setRules("required|string"); - SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description"); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); + SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser"); browserItem.setRules("required|string"); // 编辑状态下赋值操作 @@ -214,9 +214,9 @@ public class SequenceServiceImpl extends Service implements SequenceService { public Map getTabInfo() { Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); - topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); - topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build()); - topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build()); + topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).viewCondition("-1").build()); + topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186,user.getLanguage())).viewCondition("0").build()); + topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build()); apiDatas.put("topTabs", topTabs); HashMap countMap = new HashMap<>(); diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index c67cf56a..3866969d 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -115,7 +115,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); return getStaffPlanMapper().deleteByIds(ids); } @@ -125,9 +125,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); // 编号 - SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "planNo"); + SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "planNo"); // 名称 - SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "planName"); + SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName"); // 年度 SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "年度", "planYear"); planYearItem.setFormat("YYYY"); @@ -141,8 +141,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); // 状态 List selectOptions = new ArrayList<>(); - SearchConditionOption enableOption = new SearchConditionOption("true", "启用"); - SearchConditionOption disableOption = new SearchConditionOption("false", "禁用"); + SearchConditionOption enableOption = new SearchConditionOption("true", SystemEnv.getHtmlLabelName(547186, user.getLanguage())); + SearchConditionOption disableOption = new SearchConditionOption("false", SystemEnv.getHtmlLabelName(547192, user.getLanguage())); selectOptions.add(enableOption); selectOptions.add(disableOption); SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag"); @@ -168,10 +168,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); // 编号 - SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "planNo"); + SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547118, "planNo"); planNoItem.setRules("required|string"); // 名称 - SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "planName"); + SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName"); planNameItem.setRules("required|string"); // 年度 SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "年度", "planYear"); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 8c2b54a2..fa9d15e2 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -188,7 +188,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); + OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); List staffsByIds = getStaffMapper().getStaffsByIds(ids); int deleteByIds = getStaffMapper().deleteByIds(ids); //for (StaffPO staffsById : staffsByIds) { @@ -286,7 +286,7 @@ public class StaffServiceImpl extends Service implements StaffService { controlPolicyItem.setViewAttr(3); controlPolicyItem.setValue("1"); controlPolicyItem.setRules("required|string"); - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "描述说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, 547142, "description"); StaffPlanPO staffPlanPO = new StaffPlanPO(); // 编辑状态下赋值操作 diff --git a/src/com/engine/organization/util/page/Column.java b/src/com/engine/organization/util/page/Column.java index 6f37237f..7ec37bba 100644 --- a/src/com/engine/organization/util/page/Column.java +++ b/src/com/engine/organization/util/page/Column.java @@ -16,8 +16,10 @@ public class Column { boolean display; String width; boolean sorter; + int labelId; - public Column(String title, String dataIndex, String key, String width) { + public Column(int labelId, String title, String dataIndex, String key, String width) { + this.labelId = labelId; this.title = title; this.dataIndex = dataIndex; this.key = key; diff --git a/src/com/engine/organization/util/page/PageInfo.java b/src/com/engine/organization/util/page/PageInfo.java index 56cdbd0e..b5fa6daf 100644 --- a/src/com/engine/organization/util/page/PageInfo.java +++ b/src/com/engine/organization/util/page/PageInfo.java @@ -56,7 +56,8 @@ public class PageInfo extends com.github.pagehelper.PageInfo { boolean display = annotation.display(); String width = annotation.width(); boolean sorter = annotation.sorter(); - Column column = Column.builder().sorter(sorter).width(width).title(title).dataIndex(dataIndex).key(key).display(display).build(); + int labelId = annotation.labelId(); + Column column = Column.builder().sorter(sorter).width(width).labelId(labelId).title(title).dataIndex(dataIndex).key(key).display(display).build(); columns.add(column); } } diff --git a/src/com/engine/organization/util/response/ResultCode.java b/src/com/engine/organization/util/response/ResultCode.java index 92670362..22120f9b 100644 --- a/src/com/engine/organization/util/response/ResultCode.java +++ b/src/com/engine/organization/util/response/ResultCode.java @@ -1,22 +1,24 @@ package com.engine.organization.util.response; -public enum ResultCode implements IErrorCode { - SUCCESS(200,"操作成功"), - FAILED(500,"操作失败"), - VALIDATE_FAILED(404,"参数检验失败"), - UNAUTHORIZED(401,"暂未登陆或相关token已经过期"), - FORBIDDEN(403,"没有相关权限"), +public enum ResultCode implements IErrorCode { + SUCCESS(200, "操作成功", 547157), + FAILED(500, "操作失败", 547158), + VALIDATE_FAILED(404, "参数检验失败", -1), + UNAUTHORIZED(401, "暂未登陆或相关token已经过期", -1), + FORBIDDEN(403, "没有相关权限", -1), - BODY_NOT_MATCH(400,"请求的数据格式不符!"), - INTERNAL_SERVER_ERROR(500, "服务器内部错误!"), - SERVER_BUSY(503,"服务器正忙，请稍后再试!"); + BODY_NOT_MATCH(400, "请求的数据格式不符!", -1), + INTERNAL_SERVER_ERROR(500, "服务器内部错误!", -1), + SERVER_BUSY(503, "服务器正忙，请稍后再试!", -1); private long code; private String msg; + private int labelId; - ResultCode(long code, String msg) { + ResultCode(long code, String msg, int labelId) { this.code = code; this.msg = msg; + this.labelId = labelId; } @Override @@ -28,11 +30,18 @@ public enum ResultCode implements IErrorCode { public String getMessage() { return msg; } + + @Override + public int getLabelId() { + return labelId; + } } interface IErrorCode { long getCode(); String getMessage(); + + int getLabelId(); } diff --git a/src/com/engine/organization/util/response/ReturnResult.java b/src/com/engine/organization/util/response/ReturnResult.java index c1b2db72..d5fedfbe 100644 --- a/src/com/engine/organization/util/response/ReturnResult.java +++ b/src/com/engine/organization/util/response/ReturnResult.java @@ -8,6 +8,8 @@ package com.engine.organization.util.response; **/ import weaver.general.BaseBean; +import weaver.hrm.User; +import weaver.systeminfo.SystemEnv; import java.io.Serializable; @@ -111,11 +113,24 @@ public class ReturnResult implements Serializable { * @param data * @return */ + @Deprecated public static ReturnResult successed(T data) { return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); } + /** + * 多语言响应 + * + * @param user + * @param data + * @param + * @return + */ + public static ReturnResult successed(User user, T data) { + return new ReturnResult<>(ResultCode.SUCCESS.getCode(), SystemEnv.getHtmlLabelName(ResultCode.SUCCESS.getLabelId(), user.getLanguage()), data); + } + /** * 异常处理 * diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index d91eb655..8c269d98 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -47,7 +47,7 @@ public class SchemeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSchemeWrapper(user).listPage(map)); + return ReturnResult.successed(user,getSchemeWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -66,7 +66,7 @@ public class SchemeController { public ReturnResult saveScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).save(param)); + return ReturnResult.successed(user,getSchemeWrapper(user).save(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -86,7 +86,7 @@ public class SchemeController { public ReturnResult updateScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).updateScheme(param)); + return ReturnResult.successed(user,getSchemeWrapper(user).updateScheme(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -107,7 +107,7 @@ public class SchemeController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getSchemeWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -128,7 +128,7 @@ public class SchemeController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getSchemeWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -141,7 +141,7 @@ public class SchemeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSchemeWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getSchemeWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -155,7 +155,7 @@ public class SchemeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSchemeWrapper(user).getSchemeForm(map)); + return ReturnResult.successed(user,getSchemeWrapper(user).getSchemeForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -167,7 +167,7 @@ public class SchemeController { public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).getTableBtn()); + return ReturnResult.successed(user,getSchemeWrapper(user).getTableBtn()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -179,7 +179,7 @@ public class SchemeController { public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSchemeWrapper(user).getTreeData()); + return ReturnResult.successed(user,getSchemeWrapper(user).getTreeData()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); }