Merge pull request 'feature/dxf' (#242) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/242
This commit is contained in:
commit
5deca3460e
|
|
@ -118,11 +118,11 @@ public class JobBrowserService extends BrowserService {
|
|||
Map<String, List<SearchConditionItem>> apiDatas = new HashMap<>();
|
||||
List<SearchConditionItem> 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", "");
|
||||
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "ecCompany", "");
|
||||
// 所属部门
|
||||
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", "");
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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,37 +34,37 @@ 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;
|
||||
|
||||
/**
|
||||
* 简称
|
||||
*/
|
||||
@TableTitle(title = "简称", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
@TableTitle(labelId = 547181, title = "简称", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
private String subCompanyName;
|
||||
|
||||
/**
|
||||
* 上级公司
|
||||
*/
|
||||
@TableTitle(title = "上级分部", dataIndex = "supSubComName", key = "supSubComName")
|
||||
@TableTitle(labelId = 547410, title = "上级分部", dataIndex = "supSubComName", key = "supSubComName")
|
||||
private String supSubComName;
|
||||
|
||||
private Integer supSubComId;
|
||||
|
||||
|
||||
@TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
@TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
private Integer showOrder;
|
||||
|
||||
/**
|
||||
* 禁用标记
|
||||
*/
|
||||
@TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
|
||||
@TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled")
|
||||
private Integer canceled;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -36,32 +36,32 @@ 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;
|
||||
|
||||
/**
|
||||
* 简称
|
||||
*/
|
||||
@TableTitle(title = "简称", dataIndex = "departmentName", key = "departmentName")
|
||||
@TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName")
|
||||
private String departmentName;
|
||||
|
||||
/**
|
||||
* 所属分部
|
||||
*/
|
||||
@TableTitle(title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
@TableTitle(labelId = 547128, title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
private String subCompanyName;
|
||||
private Integer subCompanyId1;
|
||||
|
||||
/**
|
||||
* 上级部门
|
||||
*/
|
||||
@TableTitle(title = "上级部门", dataIndex = "supDepName", key = "supDepName")
|
||||
@TableTitle(labelId = 547189, title = "上级部门", dataIndex = "supDepName", key = "supDepName")
|
||||
private String supDepName;
|
||||
|
||||
private Integer supDepId;
|
||||
|
|
@ -69,20 +69,20 @@ public class DepartmentListDTO {
|
|||
/**
|
||||
* 部门负责人
|
||||
*/
|
||||
@TableTitle(title = "部门负责人", dataIndex = "bmfzr", key = "bmfzr")
|
||||
@TableTitle(labelId = 547190, title = "部门负责人", dataIndex = "bmfzr", key = "bmfzr")
|
||||
private String bmfzr;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
@TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
private Double showOrder;
|
||||
|
||||
|
||||
/**
|
||||
* 禁用标记
|
||||
*/
|
||||
@TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
|
||||
@TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled")
|
||||
private int canceled;
|
||||
/**
|
||||
* 操作列
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
@ -36,7 +36,7 @@ public class SingleDeptTreeVO {
|
|||
|
||||
private Integer supDepId; //上级部门id
|
||||
|
||||
@TableTitle(title = "上级部门", dataIndex = "supDepName", key = "supDepName")
|
||||
@TableTitle(labelId = 547189, title = "上级部门", dataIndex = "supDepName", key = "supDepName")
|
||||
private String supDepName; //上级部门
|
||||
|
||||
//@TableTitle(title = "部门负责人", dataIndex = "deptPrincipalName", key = "deptPrincipalName")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -84,6 +84,6 @@ public class HrmResourceVO {
|
|||
@OrganizationTableColumn(text = "直接上级", width = "25%", column = "managerid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName")
|
||||
private String managerName;
|
||||
|
||||
@OrganizationTableColumn(text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
|
||||
@OrganizationTableColumn(labelId = 547185, text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
|
||||
private Integer showOrder;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -80,6 +80,6 @@ public class ScHrmResourceVO {
|
|||
@OrganizationTableColumn(text = "直接上级", width = "25%", column = "managerid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getScManagerName")
|
||||
private String managerName;
|
||||
|
||||
@OrganizationTableColumn(text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
|
||||
@OrganizationTableColumn(labelId = 547185, text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
|
||||
private Integer showOrder;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,17 +34,17 @@ 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;
|
||||
/**
|
||||
* 所属分部
|
||||
*/
|
||||
@TableTitle(title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
@TableTitle(labelId = 547128, title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
|
||||
private String subCompanyName;
|
||||
/**
|
||||
* 所属部门
|
||||
|
|
@ -80,7 +80,7 @@ public class JobListDTO {
|
|||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
@TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
|
||||
private Integer showOrder;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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<String, Object> getCardButtonTable() {
|
||||
List<ExtendInfoPO> 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());
|
||||
|
||||
|
|
|
|||
|
|
@ -91,13 +91,13 @@ public class CompServiceImpl extends Service implements CompService {
|
|||
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
|
||||
}
|
||||
List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
|
||||
pageInfos = new PageInfo<>(subList, CompListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, subList, CompListDTO.class);
|
||||
pageInfos.setTotal(compListDTOS.size());
|
||||
} else {
|
||||
// 组合list
|
||||
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, orderType.toString());
|
||||
List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
|
||||
pageInfos = new PageInfo<>(subList, CompListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, subList, CompListDTO.class);
|
||||
pageInfos.setTotal(compListDTOS.size());
|
||||
}
|
||||
|
||||
|
|
@ -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", v.getTitle(), v.getKey())).collect(Collectors.toList());
|
||||
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
|
||||
table.setColumns(weaTableColumn);
|
||||
WeaResultMsg result = new WeaResultMsg(false);
|
||||
result.putAll(table.makeDataResult());
|
||||
|
|
@ -150,7 +150,7 @@ public class CompServiceImpl extends Service implements CompService {
|
|||
if (CollectionUtils.isNotEmpty(compPOS)) {
|
||||
addDisableIds(disableIds, compPOS);
|
||||
}
|
||||
OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supSubComId)), "上级分部不能选择分部本身及其下级分部");
|
||||
OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supSubComId)), SystemEnv.getHtmlLabelName(547257,user.getLanguage()));
|
||||
}
|
||||
|
||||
new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync();
|
||||
|
|
@ -178,13 +178,13 @@ public class CompServiceImpl extends Service implements CompService {
|
|||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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");
|
||||
SearchConditionItem subCompanyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547181, "subCompanyName");
|
||||
// 上级公司
|
||||
SearchConditionItem supSubComIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "supSubComId", "");
|
||||
SearchConditionItem supSubComIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "supSubComId", "");
|
||||
|
||||
conditionItems.add(subCompanyCodeItem);
|
||||
conditionItems.add(subCompanyDescItem);
|
||||
|
|
@ -374,8 +374,8 @@ public class CompServiceImpl extends Service implements CompService {
|
|||
public List<SearchConditionGroup> getMoveForm() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> condition = new ArrayList<>();
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "转移到", "164", "company", "compBrowser");
|
||||
compBrowserItem.setHelpfulTip("在不选择分部情况下,默认转移到集团下一级分部！！！");
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547275, "164", "company", "compBrowser");
|
||||
compBrowserItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547258,user.getLanguage()));
|
||||
condition.add(compBrowserItem);
|
||||
addGroups.add(new SearchConditionGroup("", true, condition));
|
||||
return addGroups;
|
||||
|
|
@ -393,7 +393,7 @@ public class CompServiceImpl extends Service implements CompService {
|
|||
if (CollectionUtils.isNotEmpty(compPOS)) {
|
||||
addDisableIds(disableIds, compPOS);
|
||||
}
|
||||
OrganizationAssert.isFalse(disableIds.contains(targetCompanyId), "请勿选择当前分部本身及其子分部");
|
||||
OrganizationAssert.isFalse(disableIds.contains(targetCompanyId), SystemEnv.getHtmlLabelName(547259,user.getLanguage()));
|
||||
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("id", companyId.toString());
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import com.engine.hrm.entity.RuleCodeType;
|
|||
import com.engine.hrm.service.impl.OrganizationServiceImpl;
|
||||
import com.engine.organization.component.OrganizationWeaTable;
|
||||
import com.engine.organization.entity.TopTab;
|
||||
import com.engine.organization.entity.codesetting.po.CodeRulePO;
|
||||
import com.engine.organization.entity.company.bo.CompBO;
|
||||
import com.engine.organization.entity.company.po.CompPO;
|
||||
import com.engine.organization.entity.department.bo.DepartmentBO;
|
||||
|
|
@ -29,7 +28,6 @@ import com.engine.organization.entity.searchtree.SearchTreeParams;
|
|||
import com.engine.organization.enums.LogModuleNameEnum;
|
||||
import com.engine.organization.enums.OperateTypeEnum;
|
||||
import com.engine.organization.exception.OrganizationRunTimeException;
|
||||
import com.engine.organization.mapper.codesetting.CodeRuleMapper;
|
||||
import com.engine.organization.mapper.comp.CompMapper;
|
||||
import com.engine.organization.mapper.department.DepartmentMapper;
|
||||
import com.engine.organization.mapper.job.JobMapper;
|
||||
|
|
@ -75,10 +73,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
return MapperProxyFactory.getProxy(DepartmentMapper.class);
|
||||
}
|
||||
|
||||
private static JobMapper getJobMapper() {
|
||||
return MapperProxyFactory.getProxy(JobMapper.class);
|
||||
}
|
||||
|
||||
private CompMapper getCompMapper() {
|
||||
return MapperProxyFactory.getProxy(CompMapper.class);
|
||||
}
|
||||
|
|
@ -90,7 +84,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
List<DepartmentPO> departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).listAll("showOrder");
|
||||
PageInfo<DepartmentPO> pageInfo = new PageInfo<>(departmentPOS);
|
||||
List<SingleDeptTreeVO> singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS, param.getParentComp());
|
||||
PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleDeptTreeVO.class);
|
||||
PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(user, singleDeptTreeVOS, SingleDeptTreeVO.class);
|
||||
pageInfos.setTotal(pageInfo.getTotal());
|
||||
pageInfos.setPageNum(param.getCurrent());
|
||||
pageInfos.setPageSize(param.getPageSize());
|
||||
|
|
@ -103,7 +97,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll();
|
||||
PageInfo<JobPO> pageInfo = new PageInfo<>(jobPOS);
|
||||
List<SingleJobTreeVO> singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept());
|
||||
PageInfo<SingleJobTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleJobTreeVO.class);
|
||||
PageInfo<SingleJobTreeVO> pageInfos = new PageInfo<>(user, singleDeptTreeVOS, SingleJobTreeVO.class);
|
||||
pageInfos.setTotal(pageInfo.getTotal());
|
||||
pageInfos.setPageNum(param.getCurrent());
|
||||
pageInfos.setPageSize(param.getPageSize());
|
||||
|
|
@ -150,13 +144,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
|
||||
}
|
||||
List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
|
||||
pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
|
||||
pageInfos.setTotal(compListDTOS.size());
|
||||
} else {
|
||||
// 组合list
|
||||
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, orderType.toString());
|
||||
List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
|
||||
pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
|
||||
pageInfos.setTotal(compListDTOS.size());
|
||||
}
|
||||
|
||||
|
|
@ -165,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", v.getTitle(), v.getKey())).collect(Collectors.toList());
|
||||
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
|
||||
|
||||
table.setColumns(weaTableColumn);
|
||||
|
||||
|
|
@ -212,7 +206,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
if (CollectionUtils.isNotEmpty(deptListByPId)) {
|
||||
addDisableIds(disableIds, deptListByPId);
|
||||
}
|
||||
OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supDepId)), "上级部门不能选择部门本身及其下级部门");
|
||||
OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supDepId)), SystemEnv.getHtmlLabelName(547411,user.getLanguage()));
|
||||
}
|
||||
|
||||
new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, params).sync();
|
||||
|
|
@ -231,13 +225,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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", "");
|
||||
SearchConditionItem subCompanyId1Item = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subCompanyId1", "");
|
||||
// 上级部门
|
||||
SearchConditionItem supDepIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "4", "supDepId", "");
|
||||
SearchConditionItem supDepIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547189, "4", "supDepId", "");
|
||||
|
||||
conditionItems.add(departmentCodeItem);
|
||||
conditionItems.add(departmentNameItem);
|
||||
|
|
@ -251,16 +245,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
|
||||
@Override
|
||||
public Map<String, List<MenuBtn>> getHasRight() {
|
||||
MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
|
||||
MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547117,user.getLanguage())).type("BTN_Addnew").build();
|
||||
Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum(user.getLanguage());
|
||||
datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
|
||||
datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
|
||||
datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_Export").build());
|
||||
datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_Export").build());
|
||||
return datasNoBtnColum;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> getDeptBaseForm(Map<String, Object> params) {
|
||||
OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型");
|
||||
OrganizationAssert.notNull(params.get("viewAttr"), SystemEnv.getHtmlLabelName(547260,user.getLanguage()));
|
||||
// 2编辑 1查看
|
||||
int viewAttr = Integer.parseInt((String) params.get("viewAttr"));
|
||||
|
||||
|
|
@ -405,7 +399,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
resultMap.put("conditions", groupList);
|
||||
resultMap.put("id", id);
|
||||
List<TopTab> topTabs = new ArrayList<>();
|
||||
topTabs.add(TopTab.builder().color("#000000").groupId("4").showcount(false).title("部门信息").viewCondition("4").build());
|
||||
topTabs.add(TopTab.builder().color("#000000").groupId("4").showcount(false).title(SystemEnv.getHtmlLabelName(547412,user.getLanguage())).viewCondition("4").build());
|
||||
resultMap.put("tabInfo", topTabs);
|
||||
|
||||
Map<String, Object> apiDatas = new HashMap<>();
|
||||
|
|
@ -430,9 +424,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
public List<SearchConditionGroup> getCopyForm() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> condition = new ArrayList<>();
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "164", "company", "");
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547261, "164", "company", "");
|
||||
compBrowserItem.setRules("required|string");
|
||||
SearchConditionItem copySubDeptItem = OrganizationFormItemUtil.selectItem(user, Lists.newArrayList(new SearchConditionOption("1", "")), 2, 5, 10, false, "复制子部门信息", "copySubDept");
|
||||
SearchConditionItem copySubDeptItem = OrganizationFormItemUtil.selectItem(user, Lists.newArrayList(new SearchConditionOption("1", "")), 2, 5, 10, false, SystemEnv.getHtmlLabelName(547262,user.getLanguage()), "copySubDept");
|
||||
copySubDeptItem.setDetailtype(2);
|
||||
condition.add(compBrowserItem);
|
||||
condition.add(copySubDeptItem);
|
||||
|
|
@ -450,7 +444,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
public int copyDepartment(DeptCopyParam copyParam) {
|
||||
// 批量复制，后续优化
|
||||
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
||||
OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部");
|
||||
OrganizationAssert.notBlank(copyParam.getCompany(), SystemEnv.getHtmlLabelName(547263,user.getLanguage()));
|
||||
int insertCount = 0;
|
||||
// 需复制的部门
|
||||
List<Integer> idList = Arrays.stream(copyParam.getIds().split(",")).map(Integer::parseInt).collect(Collectors.toList());
|
||||
|
|
@ -466,7 +460,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
private void recursionCopyDept(Integer originalDeptId, Integer parentDepartmentId, Integer companyId, Double maxShowOrder, String copyJob, String copySubDept, String copySubJob) {
|
||||
// 源部门
|
||||
DepartmentPO deptById = getDepartmentMapper().getDeptById(originalDeptId);
|
||||
long timeMillis = System.currentTimeMillis();
|
||||
// 处理自动编号
|
||||
deptById.setDepartmentCode(null);
|
||||
// 设置上级分部
|
||||
|
|
@ -480,19 +473,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
Map<String, Object> syncMap = addEcDepartment(deptById);
|
||||
String ecDepartmentID = Util.null2String(syncMap.get("id"));
|
||||
OrganizationAssert.isTrue(StringUtils.isNotBlank(ecDepartmentID), syncMap.get("message").toString());
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(deptById.getId()).run();
|
||||
|
||||
// 复制当前部门岗位信息
|
||||
//if ("1".equals(copyJob)) {
|
||||
// List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(originalDeptId);
|
||||
// jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
|
||||
// Integer maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder();
|
||||
// if (maxJobOrder == null) {
|
||||
// maxJobOrder = 0;
|
||||
// }
|
||||
// recursionCopyJob(jobPOS, companyId, Integer.parseInt(ecDepartmentID), null, maxJobOrder, timeMillis);
|
||||
//}
|
||||
|
||||
// 是否复制子部门信息
|
||||
if ("1".equals(copySubDept)) {
|
||||
|
|
@ -509,9 +489,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
public List<SearchConditionGroup> getMergeForm() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> condition = new ArrayList<>();
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "4", "department", "");
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547264, "4", "department", "");
|
||||
deptBrowserItem.setRules("required|string");
|
||||
SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
|
||||
SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547265, "mergeName");
|
||||
mergeNameItem.setRules("required|string");
|
||||
|
||||
condition.add(deptBrowserItem);
|
||||
|
|
@ -529,10 +509,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
|
||||
|
||||
// 断言判断
|
||||
OrganizationAssert.isFalse(null == targetDepartment, "被合并部门数据有误，暂时无法合并");
|
||||
OrganizationAssert.isFalse(mergeParam.getId().equals(targetDepartment.getId()), "所选部门与待合并部门一致，无需操作");
|
||||
OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门");
|
||||
OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称");
|
||||
OrganizationAssert.isFalse(null == targetDepartment, SystemEnv.getHtmlLabelName(547266,user.getLanguage()));
|
||||
OrganizationAssert.isFalse(mergeParam.getId().equals(targetDepartment.getId()), SystemEnv.getHtmlLabelName(547267,user.getLanguage()));
|
||||
OrganizationAssert.notNull(mergeParam.getDepartment(), SystemEnv.getHtmlLabelName(547268,user.getLanguage()));
|
||||
OrganizationAssert.notBlank(mergeParam.getMergeName(), SystemEnv.getHtmlLabelName(547270,user.getLanguage()));
|
||||
|
||||
// 不可选择合并的数据，本身及子部门
|
||||
Set<Integer> disableIds = new HashSet<>();
|
||||
|
|
@ -542,7 +522,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
if (CollectionUtils.isNotEmpty(deptListByPId)) {
|
||||
addDisableIds(disableIds, deptListByPId);
|
||||
}
|
||||
OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门");
|
||||
OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
|
||||
|
||||
// 查询该部门下一级部门
|
||||
List<DepartmentPO> firstChildDeptList = getDepartmentMapper().getDeptListByPId(mergeParam.getId());
|
||||
|
|
@ -551,41 +531,24 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
departmentPO.setSupDepId(targetDepartment.getId());
|
||||
departmentPO.setSubCompanyId1(targetDepartment.getSubCompanyId1());
|
||||
updateEcDepartment(departmentPO);
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(departmentPO.getId()).run();
|
||||
}
|
||||
// 查询该部门一级岗位、更新岗位所属分部、所属部门
|
||||
//List<JobPO> firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId());
|
||||
//firstChildJobList = firstChildJobList.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
|
||||
// 批量更新部门、所属分部
|
||||
RecordSet rs = new RecordSet();
|
||||
String targetEcDeptId = targetDepartment.getId().toString();
|
||||
String mergeEcDeptId = mergeParam.getId().toString();
|
||||
//rs.executeUpdate("update jcl_org_job set parent_comp =?,ec_company =?,parent_dept =?,ec_department =? where ec_department =?", targetDepartment.getSubCompanyId1(), targetDepartment.getSubCompanyId1(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
|
||||
// 更新岗位组织架构图
|
||||
//for (JobPO jobPO : firstChildJobList) {
|
||||
// // 刷新组织架构图
|
||||
// new JobTriggerRunnable(jobPO.getId()).run();
|
||||
//}
|
||||
// 更新当前部门下的人员
|
||||
rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getSubCompanyId1(), targetEcDeptId, mergeEcDeptId);
|
||||
//new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? ,department_id = ?, ec_department = ?where department_id =?", targetDepartment.getParentComp(), targetDepartment.getEcCompany(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
|
||||
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString());
|
||||
//// 更新人员组织架构图
|
||||
//for (Long hrmResourceId : hrmResourceIds) {
|
||||
// new HrmResourceTriggerRunnable(hrmResourceId).run();
|
||||
//}
|
||||
|
||||
// 更新子部门下岗位的所属分部
|
||||
for (DepartmentPO departmentPO : firstChildDeptList) {
|
||||
List<DepartmentPO> deptList = getDepartmentMapper().getDeptListByPId(departmentPO.getId());
|
||||
forbiddenChildTag(targetDepartment.getSubCompanyId1(), deptList);
|
||||
}
|
||||
// 原部门删除
|
||||
// DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
|
||||
|
||||
// 删除部门（先更改原部门名称，释放原部门名称，然后删除）
|
||||
DepartmentPO sourceDepartmentPO = getDepartmentMapper().getDeptById(mergeParam.getId());
|
||||
sourceDepartmentPO.setDepartmentName(sourceDepartmentPO.getDepartmentName() + "_被合并");
|
||||
sourceDepartmentPO.setDepartmentMark(sourceDepartmentPO.getDepartmentMark() + "_被合并");
|
||||
sourceDepartmentPO.setDepartmentName(sourceDepartmentPO.getDepartmentName() + SystemEnv.getHtmlLabelName(547272,user.getLanguage()));
|
||||
sourceDepartmentPO.setDepartmentMark(sourceDepartmentPO.getDepartmentMark() + SystemEnv.getHtmlLabelName(547272,user.getLanguage()));
|
||||
updateEcDepartment(sourceDepartmentPO);
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("id", Util.null2String(mergeParam.getId()));
|
||||
|
|
@ -593,14 +556,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
// 删除原部门下的岗位
|
||||
|
||||
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(mergeDepartment).run();
|
||||
|
||||
// 更新部门合并后名称
|
||||
targetDepartment.setDepartmentName(mergeParam.getMergeName());
|
||||
targetDepartment.setDepartmentMark(mergeParam.getMergeName());
|
||||
updateEcDepartment(targetDepartment);
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -608,8 +569,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
public List<SearchConditionGroup> getMoveForm() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> condition = new ArrayList<>();
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "选择分部", "164", "company", "");
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "选择部门", "4", "department", "");
|
||||
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547273, "164", "company", "");
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547274, "4", "department", "");
|
||||
|
||||
|
||||
List<SearchConditionOption> selectOptions = new ArrayList<>();
|
||||
|
|
@ -617,7 +578,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
SearchConditionOption deptOption = new SearchConditionOption("1", "部门");
|
||||
selectOptions.add(compOption);
|
||||
selectOptions.add(deptOption);
|
||||
SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "转移到", "moveType");
|
||||
SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547275, "moveType");
|
||||
moveTypeItem.setDetailtype(3);
|
||||
moveTypeItem.setValue("0");
|
||||
|
||||
|
|
@ -631,47 +592,34 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
@Override
|
||||
public int moveDepartment(DepartmentMoveParam moveParam) {
|
||||
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
||||
OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型");
|
||||
OrganizationAssert.notBlank(moveParam.getMoveType(), SystemEnv.getHtmlLabelName(547276,user.getLanguage()));
|
||||
DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId());
|
||||
// 0：公司/分部 1：部门
|
||||
if ("0".equals(moveParam.getMoveType())) {
|
||||
Integer company = moveParam.getCompany();
|
||||
OrganizationAssert.notNull(company, "请选择要转移到的分部");
|
||||
OrganizationAssert.notNull(company, SystemEnv.getHtmlLabelName(547277,user.getLanguage()));
|
||||
deptById.setSubCompanyId1(company);
|
||||
deptById.setSupDepId(null);
|
||||
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(company.toString(), deptById).run();
|
||||
} else if ("1".equals(moveParam.getMoveType())) {
|
||||
Integer departmentId = moveParam.getDepartment();
|
||||
OrganizationAssert.notNull(departmentId, "请选择要转移到的部门");
|
||||
OrganizationAssert.notNull(departmentId, SystemEnv.getHtmlLabelName(547278,user.getLanguage()));
|
||||
List<DepartmentPO> deptListByPId = getDepartmentMapper().getDeptListByPId(moveParam.getId());
|
||||
Set<Integer> disableIds = new HashSet<>();
|
||||
disableIds.add(moveParam.getId());
|
||||
if (CollectionUtils.isNotEmpty(deptListByPId)) {
|
||||
addDisableIds(disableIds, deptListByPId);
|
||||
}
|
||||
OrganizationAssert.isFalse(disableIds.contains(departmentId), "请勿选择当前部门本身及其子部门");
|
||||
OrganizationAssert.isFalse(disableIds.contains(departmentId), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
|
||||
deptById.setSupDepId(departmentId);
|
||||
DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(departmentId);
|
||||
deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
|
||||
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run();
|
||||
}
|
||||
// 更新EC部门
|
||||
updateEcDepartment(deptById);
|
||||
|
||||
// 刷新岗位分部
|
||||
//refreshJobComp(deptById.getId(), deptById.getSubCompanyId1());
|
||||
|
||||
List<DepartmentPO> deptList = getDepartmentMapper().getDeptListByPId(deptById.getId());
|
||||
// 更新当前部门下的人员
|
||||
// new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", deptById.getSubCompanyId1(), deptById.getId());
|
||||
//// 更新人员组织架构图
|
||||
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString());
|
||||
//for (Long hrmResourceId : hrmResourceIds) {
|
||||
// new HrmResourceTriggerRunnable(hrmResourceId).run();
|
||||
//}
|
||||
|
||||
forbiddenChildTag(deptById.getSubCompanyId1(), deptList);
|
||||
// 递归更新下级部门、岗位
|
||||
return 1;
|
||||
|
|
@ -695,8 +643,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
String supId = "";
|
||||
String ftype = "";
|
||||
String querySupIdSql;
|
||||
// OrganizationAssert.isFalse("s".equals(sourceType) && "d".equals(targetType), "分部不能转移到部门下");
|
||||
OrganizationAssert.isFalse("-1".equals(dragPostion), "分部、部门不能转移至与集团平级");
|
||||
OrganizationAssert.isFalse("-1".equals(dragPostion), SystemEnv.getHtmlLabelName(547279,user.getLanguage()));
|
||||
if ("s".equals(targetType)) {// 分部
|
||||
querySupIdSql = "select companyId as supComId,supsubcomid as supId,'s' as ftype from hrmsubcompany where id = ?";
|
||||
} else {
|
||||
|
|
@ -713,7 +660,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("id", sourceId);
|
||||
if ("0".equals(dragPostion)) {//内部
|
||||
OrganizationAssert.isFalse("d".equals(targetType), "分部不能拖拽至部门下");
|
||||
OrganizationAssert.isFalse("d".equals(targetType), SystemEnv.getHtmlLabelName(547280,user.getLanguage()));
|
||||
if ("c".equals(targetType)) {// 集团下（上级分部为0）
|
||||
params.put("supsubcomid", "0");
|
||||
} else if ("s".equals(targetType)) {
|
||||
|
|
@ -723,7 +670,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
if ("s".equals(targetType)) {// 分部外（平级）
|
||||
params.put("supsubcomid", supId);
|
||||
} else {// 部门外（找上级）
|
||||
OrganizationAssert.isFalse("d".equals(ftype), "分部不能拖拽至部门下");
|
||||
OrganizationAssert.isFalse("d".equals(ftype), SystemEnv.getHtmlLabelName(547280,user.getLanguage()));
|
||||
params.put("supsubcomid", supId);
|
||||
}
|
||||
}
|
||||
|
|
@ -732,7 +679,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
List<DepartmentPO> deptListByPId;
|
||||
Set<Integer> disableIds = new HashSet<>();
|
||||
if ("0".equals(dragPostion)) {//内部
|
||||
OrganizationAssert.isFalse("c".equals(targetType), "部门不能拖拽至集团下");
|
||||
OrganizationAssert.isFalse("c".equals(targetType), SystemEnv.getHtmlLabelName(547281,user.getLanguage()));
|
||||
if ("s".equals(targetType)) {
|
||||
deptById.setSubCompanyId1(Util.getIntValue(targetId));
|
||||
deptById.setSupDepId(null);
|
||||
|
|
@ -742,14 +689,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
if (CollectionUtils.isNotEmpty(deptListByPId)) {
|
||||
addDisableIds(disableIds, deptListByPId);
|
||||
}
|
||||
OrganizationAssert.isFalse("d".equals(targetType) && disableIds.contains(Util.getIntValue(targetId)), "请勿选择当前部门本身及其子部门");
|
||||
OrganizationAssert.isFalse("d".equals(targetType) && disableIds.contains(Util.getIntValue(targetId)), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
|
||||
deptById.setSupDepId(Util.getIntValue(targetId));
|
||||
DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(Util.getIntValue(targetId));
|
||||
deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
|
||||
}
|
||||
} else {//外部
|
||||
if ("s".equals(targetType)) {
|
||||
OrganizationAssert.isFalse("0".equals(supId), "部门不能拖拽至集团下");
|
||||
OrganizationAssert.isFalse("0".equals(supId), SystemEnv.getHtmlLabelName(547281,user.getLanguage()));
|
||||
deptById.setSubCompanyId1(Util.getIntValue(supId));
|
||||
deptById.setSupDepId(null);
|
||||
} else {
|
||||
|
|
@ -785,19 +732,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
// 更新EC表部门
|
||||
updateEcDepartment(departmentPO);
|
||||
|
||||
// 更新组织架构图
|
||||
// new DepartmentTriggerRunnable(departmentPO.getId()).run();
|
||||
// 刷新岗位所属分部
|
||||
//refreshJobComp(departmentPO.getId(), subCompanyId1);
|
||||
// 更新当前部门下的人员
|
||||
// String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString());
|
||||
//new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId);
|
||||
//new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", parentComp, ecCompanyId, departmentPO.getId());
|
||||
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString());
|
||||
//// 更新人员组织架构图
|
||||
//for (Long hrmResourceId : hrmResourceIds) {
|
||||
// new HrmResourceTriggerRunnable(hrmResourceId).run();
|
||||
//}
|
||||
List<DepartmentPO> childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId());
|
||||
forbiddenChildTag(subCompanyId1, childList);
|
||||
}
|
||||
|
|
@ -859,23 +793,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断编号是否重复
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public String repeatDetermine(String deptNo) {
|
||||
CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue());
|
||||
if (StringUtils.isNotBlank(deptNo)) {
|
||||
deptNo = CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptNo);
|
||||
List<DepartmentPO> list = getDepartmentMapper().listByNo(Util.null2String(deptNo));
|
||||
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
|
||||
} else {
|
||||
OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
|
||||
deptNo = autoCreateCompanyNo();
|
||||
}
|
||||
return deptNo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 自动编号处理
|
||||
|
|
@ -935,19 +852,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新岗位的所属分部
|
||||
*
|
||||
* @param parentDepartment
|
||||
* @param parentComp
|
||||
*/
|
||||
private void refreshJobComp(Integer parentDepartment, Integer parentComp) {
|
||||
List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment);
|
||||
jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
|
||||
if (CollectionUtils.isNotEmpty(jobPOS)) {
|
||||
getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private List<SearchConditionGroup> getDepartmentConditionGroups(Boolean showAll, Map<String, Object> params) {
|
||||
List<SearchConditionGroup> groupList = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -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<Long> 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<String, Object> apiDatas = new HashMap<>();
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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<SearchConditionGroup> 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<String, Object> getTabInfo() {
|
||||
Map<String, Object> apiDatas = new HashMap<>();
|
||||
List<TopTab> 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<String, Integer> countMap = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -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<SearchConditionOption> 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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,13 +169,13 @@ public class JobServiceImpl extends Service implements JobService {
|
|||
jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
|
||||
}
|
||||
List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
|
||||
pageInfos = new PageInfo<>(subList, JobListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
|
||||
pageInfos.setTotal(jobListDTOS.size());
|
||||
} else {
|
||||
// 组合list
|
||||
List<JobListDTO> jobListDTOS = JobBO.buildDTOList(allList);
|
||||
List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
|
||||
pageInfos = new PageInfo<>(subList, JobListDTO.class);
|
||||
pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
|
||||
pageInfos.setTotal(jobListDTOS.size());
|
||||
}
|
||||
|
||||
|
|
@ -222,11 +222,11 @@ public class JobServiceImpl extends Service implements JobService {
|
|||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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", "");
|
||||
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subcompanyid1", "");
|
||||
// 所属部门
|
||||
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", "");
|
||||
// 是否关键岗
|
||||
|
|
@ -307,7 +307,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|||
|
||||
@Override
|
||||
public Map<String, Object> getJobBaseForm(Map<String, Object> params) {
|
||||
OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型");
|
||||
OrganizationAssert.notNull(params.get("viewAttr"), SystemEnv.getHtmlLabelName(547260,user.getLanguage()));
|
||||
|
||||
// 2编辑 1查看
|
||||
int viewAttr = Integer.parseInt((String) params.get("viewAttr"));
|
||||
|
|
@ -499,7 +499,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> ids) {
|
||||
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
||||
OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
|
||||
OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
|
||||
List<JobPO> jobsByIds = getJobMapper().getJobsByIds(ids);
|
||||
for (JobPO jobsById : jobsByIds) {
|
||||
// 判断是否可以删除
|
||||
|
|
@ -546,7 +546,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|||
customBrowserBean.setHasLeftTree(true);
|
||||
customBrowserBean.setLeftToSearchKey("treeKey");
|
||||
deptBrowserItem.setBrowserConditionParam(customBrowserBean);
|
||||
SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
|
||||
SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547265, "mergeName");
|
||||
mergeNameItem.setRules("required|string");
|
||||
condition.add(deptBrowserItem);
|
||||
condition.add(mergeNameItem);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public class LevelServiceImpl extends Service implements LevelService {
|
|||
public int saveLevel(LevelSearchParam param) {
|
||||
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
||||
List<LevelPO> 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<Long> 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<String, Object> apiDatas = new HashMap<>();
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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<SearchConditionGroup> 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<String, Object> getTabInfo() {
|
||||
Map<String, Object> apiDatas = new HashMap<>();
|
||||
List<TopTab> 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<String, Integer> countMap = new HashMap<>();
|
||||
|
|
@ -190,7 +190,7 @@ public class LevelServiceImpl extends Service implements LevelService {
|
|||
@Override
|
||||
public TreeData getTreeData() {
|
||||
ArrayList<TreeData> 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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ import weaver.conn.RecordSet;
|
|||
import weaver.general.GCONST;
|
||||
import weaver.general.StringUtil;
|
||||
import weaver.general.Util;
|
||||
import weaver.systeminfo.SystemEnv;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.*;
|
||||
|
|
@ -128,14 +129,14 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build());
|
||||
|
||||
resultMap.put("topMenu", topMenuList);
|
||||
// 新增
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build());
|
||||
|
||||
resultMap.put("rightMenu", rightMenuList);
|
||||
return resultMap;
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> 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<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> 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"));
|
||||
|
|
@ -233,12 +233,12 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
|
|||
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
|
||||
// 批量删除
|
||||
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
|
||||
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
|
||||
btnDatas.put("topMenu", topMenuList);
|
||||
// 新增
|
||||
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
// 日志
|
||||
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
|
||||
// 显示列定制
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class PostServiceImpl extends Service implements PostService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> 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<String, Object> apiDatas = new HashMap<>();
|
||||
List<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> 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"));
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
|
|||
} else {
|
||||
// 字段本身值、判断有无下拉框选项
|
||||
List<ConditionOption> 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<ConditionOption> 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);
|
||||
|
|
|
|||
|
|
@ -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<Long> 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<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> 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<SearchConditionGroup> getSearchCondition() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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));
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
|
|||
if (file.mkdirs()) {
|
||||
boolean newFile = excelPathFile.createNewFile();
|
||||
if (!newFile) {
|
||||
throw new IOException(outPutPath + "文件创建失败");
|
||||
throw new IOException(outPutPath + ",File Creation Failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -139,7 +139,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> 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<String, Object> apiDatas = new HashMap<>();
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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<String, Object> apiDatas = new HashMap<>();
|
||||
List<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> 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");
|
||||
|
||||
// 编辑状态下赋值操作
|
||||
|
|
@ -205,8 +205,8 @@ public class SequenceServiceImpl extends Service implements SequenceService {
|
|||
@Override
|
||||
public Map<String, List<MenuBtn>> getHasRight() {
|
||||
Map<String, List<MenuBtn>> commonBtnDatas = MenuBtn.getCommonBtnDatas(user.getLanguage());
|
||||
commonBtnDatas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
commonBtnDatas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
commonBtnDatas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
commonBtnDatas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
return commonBtnDatas;
|
||||
}
|
||||
|
||||
|
|
@ -214,9 +214,9 @@ public class SequenceServiceImpl extends Service implements SequenceService {
|
|||
public Map<String, Object> getTabInfo() {
|
||||
Map<String, Object> apiDatas = new HashMap<>();
|
||||
List<TopTab> 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<String, Integer> countMap = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> 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<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> 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<SearchConditionOption> 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<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
List<SearchConditionGroup> 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");
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ public class StaffServiceImpl extends Service implements StaffService {
|
|||
@Override
|
||||
public int deleteByIds(Collection<Long> ids) {
|
||||
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
||||
OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
|
||||
OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
|
||||
List<StaffPO> 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();
|
||||
// 编辑状态下赋值操作
|
||||
|
|
@ -357,8 +357,8 @@ public class StaffServiceImpl extends Service implements StaffService {
|
|||
@Override
|
||||
public Map<String, Object> getHasRight() {
|
||||
Map<String, List<MenuBtn>> datas = MenuBtn.getCommonBtnDatas(user.getLanguage());
|
||||
datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
|
||||
datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
|
||||
Map<String, Object> map = new HashMap<>(datas);
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> selectItems = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -49,6 +49,11 @@ public class OrganizationFormItemUtil {
|
|||
return select;
|
||||
}
|
||||
|
||||
public static SearchConditionItem selectItem(User user, List<SearchConditionOption> selectOptions, int colSpan, int fieldcol,
|
||||
int labelcol, boolean isQuickSearch, int label, String name) {
|
||||
return selectItem(user,selectOptions,colSpan,fieldcol,labelcol,isQuickSearch,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* checkbox
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import com.engine.organization.annotation.TableTitle;
|
|||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
import weaver.hrm.User;
|
||||
import weaver.systeminfo.SystemEnv;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -11,7 +13,7 @@ import java.util.List;
|
|||
|
||||
@Data
|
||||
@ToString
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
|
||||
Class<T> clazz;
|
||||
|
||||
|
|
@ -25,23 +27,23 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
|
|||
public PageInfo() {
|
||||
}
|
||||
|
||||
public PageInfo(Class<T> clazz) {
|
||||
public PageInfo(User user, Class<T> clazz) {
|
||||
this.clazz = clazz;
|
||||
this.columns = buildColumns();
|
||||
this.columns = buildColumns(user);
|
||||
}
|
||||
|
||||
public PageInfo(List<T> list) {
|
||||
super(list);
|
||||
}
|
||||
|
||||
public PageInfo(List<T> list, Class<T> clazz) {
|
||||
public PageInfo(User user, List<T> list, Class<T> clazz) {
|
||||
super(list);
|
||||
this.clazz = clazz;
|
||||
this.columns = buildColumns();
|
||||
this.columns = buildColumns(user);
|
||||
}
|
||||
|
||||
|
||||
public List<Column> buildColumns() {
|
||||
public List<Column> buildColumns(User user) {
|
||||
if (clazz == null) {
|
||||
return this.columns;
|
||||
}
|
||||
|
|
@ -56,7 +58,8 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
|
|||
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).title(-1 != labelId ? SystemEnv.getHtmlLabelName(labelId, user.getLanguage()) : title).dataIndex(dataIndex).key(key).display(display).build();
|
||||
columns.add(column);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<T> implements Serializable {
|
|||
* @param data
|
||||
* @return
|
||||
*/
|
||||
@Deprecated
|
||||
public static <T> ReturnResult<T> successed(T data) {
|
||||
|
||||
return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 多语言响应
|
||||
*
|
||||
* @param user
|
||||
* @param data
|
||||
* @param <T>
|
||||
* @return
|
||||
*/
|
||||
public static <T> ReturnResult<T> successed(User user, T data) {
|
||||
return new ReturnResult<>(ResultCode.SUCCESS.getCode(), SystemEnv.getHtmlLabelName(ResultCode.SUCCESS.getLabelId(), user.getLanguage()), data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 异常处理
|
||||
*
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class SchemeController {
|
|||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
Map<String, Object> 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<String, Object> 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<String, Object> 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ public class JobWrapper extends OrganizationWrapper {
|
|||
public ReturnResult getCopyForm() {
|
||||
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
||||
List<SearchConditionItem> condition = new ArrayList<>();
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "4", "department", "deptBrowser");
|
||||
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547261, "4", "department", "deptBrowser");
|
||||
deptBrowserItem.setRules("required|string");
|
||||
condition.add(deptBrowserItem);
|
||||
addGroups.add(new SearchConditionGroup("", true, condition));
|
||||
|
|
|
|||
Loading…
Reference in New Issue