From eeb8c47451199ff503a11e39782f4851585098bc Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 09:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 59 ++++++++++++++++ docs/表结构SQL/Oracle.sql | 1 + docs/表结构SQL/SqlServer.sql | 1 + .../organization/annotation/TableTitle.java | 2 + .../entity/company/bo/CompBO.java | 1 + .../entity/company/dto/CompListDTO.java | 15 ++-- .../entity/company/po/CompPO.java | 5 ++ .../department/dto/DepartmentListDTO.java | 22 ++---- .../entity/postion/vo/PostInfoTableVO.java | 5 +- .../organization/mapper/comp/CompMapper.java | 6 ++ .../organization/mapper/comp/CompMapper.xml | 13 +++- .../mapper/department/DepartmentMapper.xml | 2 +- .../service/impl/CompServiceImpl.java | 63 +++++++++++++++-- .../service/impl/DepartmentServiceImpl.java | 70 ++++++++++++++++--- .../service/impl/JobServiceImpl.java | 16 +++-- .../service/impl/PostInfoServiceImpl.java | 7 +- .../engine/organization/util/page/Column.java | 5 +- .../organization/util/page/PageInfo.java | 6 +- 18 files changed, 247 insertions(+), 52 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index cf55e226..e4d88dd4 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -105,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text NULL, forbidden_tag int NULL, + show_order int NULL, is_used int null, creator int null, delete_type int null, @@ -294,6 +295,64 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 ( CONSTRAINT JCL_ORG_JOBEXT_DT1_PK PRIMARY KEY (id) ); +-- JCL_ORG_HRMRESOURCE +CREATE TABLE JCL_ORG_HRMRESOURCE ( + id int auto_increment NOT NULL, + work_code varchar(60) null, + login_id varchar(60) null, + last_name varchar(60) null, + sex int null, + account_type int null, + belong_to int null, + company_id int null, + department_id int null, + job_activity int null, + job_title int null, + job_call int null, + job_level int null, + job_group_id int null, + job_activity_desc varchar(200) null, + status int null, + system_language int null, + resource_image_id varchar(1000) null, + messager_url varchar(1000) null, + location_id int null, + manager_id int null, + assistant_id int null, + mobile varchar(60) null, + telephone varchar(60) null, + mobile_call varchar(60) null, + fax varchar(60) null, + email varchar(60) null, + workroom varchar(60) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCE_PK PRIMARY KEY (id) +); + +-- JCL_ORG_HRMRESOURCEEXT +CREATE TABLE JCL_ORG_HRMRESOURCEEXT ( + id int NOT NULL, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_PK PRIMARY KEY (id) +); + +-- JCL_ORG_HRMRESOURCEEXT_DT1 +CREATE TABLE JCL_ORG_HRMRESOURCEEXT_DT1 ( + id int auto_increment NOT NULL, + mainid int NULL, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_DT1_PK PRIMARY KEY (id) +); + -- JCL_ORG_STAFFPLAN CREATE TABLE JCL_ORG_STAFFPLAN ( diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 1be6474e..425f4246 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -107,6 +107,7 @@ CREATE TABLE JCL_ORG_COMP ( COMP_PRINCIPAL NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + SHOW_ORDER NUMBER NULL, IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index c15b57bc..66df9dc9 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -105,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text COLLATE Chinese_PRC_CI_AS NULL, forbidden_tag int NULL, + show_order int null, is_used int null, creator int null, delete_type int null, diff --git a/src/com/engine/organization/annotation/TableTitle.java b/src/com/engine/organization/annotation/TableTitle.java index 22893a1a..aff2bf9a 100644 --- a/src/com/engine/organization/annotation/TableTitle.java +++ b/src/com/engine/organization/annotation/TableTitle.java @@ -11,4 +11,6 @@ public @interface TableTitle { String dataIndex(); String key(); boolean display() default true; + String width() default ""; + boolean sorter() default false; } diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 38ce339b..c43b684e 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -38,6 +38,7 @@ public class CompBO { .orgCode(e.getOrgCode()) .industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")) .compPrincipal(getUserNameById(e.getCompPrincipal() + "")) + .showOrder(e.getShowOrder()) .forbiddenTag(e.getForbiddenTag()) .build()).collect(Collectors.toList()); Map> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany)); diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 5e13182b..43b861bc 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -1,7 +1,6 @@ package com.engine.organization.entity.company.dto; import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableOperate; import com.engine.organization.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,12 +19,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@OrganizationTable(pageId = "2c66b3a4-d4f8-11ec-9774-00ffcbed7508", - operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), - @OrganizationTableOperate(index = "2", text = "查看部门") - }) +@OrganizationTable(pageId = "2c66b3a4-d4f8-11ec-9774-00ffcbed7508") public class CompListDTO { /** * 主键id @@ -44,7 +38,7 @@ public class CompListDTO { /** * 编号 */ - @TableTitle(title = "编号", dataIndex = "compNo", key = "compNo") + @TableTitle(title = "编号", dataIndex = "compNo", key = "compNo",sorter = true) private String compNo; /** @@ -56,7 +50,7 @@ public class CompListDTO { /** * 上级公司 */ - @TableTitle(title = "上级公司", dataIndex = "parentCompName", key = "parentCompName") + @TableTitle(title = "上级分部", dataIndex = "parentCompName", key = "parentCompName") private String parentCompName; private Long parentCompany; @@ -79,6 +73,9 @@ public class CompListDTO { @TableTitle(title = "负责人", dataIndex = "compPrincipal", key = "compPrincipal") private String compPrincipal; + @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder") + private Integer showOrder; + /** * 禁用标记 */ diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index f23ab7cb..c4c61fce 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -69,6 +69,11 @@ public class CompPO { */ private Integer forbiddenTag; + /** + * 显示顺序 + */ + private Integer showOrder; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 301470cf..7eb9fd9d 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -2,7 +2,6 @@ package com.engine.organization.entity.department.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableOperate; import com.engine.organization.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,15 +21,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @OrganizationTable(pageId = "96f2bb0d-da73-11ec-a0da-00ffcbed7508", - tableType = WeaTableType.NONE, - operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), - @OrganizationTableOperate(index = "2", text = "合并"), - @OrganizationTableOperate(index = "3", text = "转移"), - @OrganizationTableOperate(index = "4", text = "联查岗位"), - @OrganizationTableOperate(index = "4", text = "联查人员") - }) + tableType = WeaTableType.NONE) public class DepartmentListDTO { private Long id; @@ -38,11 +29,6 @@ public class DepartmentListDTO { * 是否被引用 */ private Integer isUsed; - /** - * 编号 - */ - @TableTitle(title = "编号", dataIndex = "deptNo", key = "deptNo") - private String deptNo; /** * 名称 @@ -50,6 +36,12 @@ public class DepartmentListDTO { @TableTitle(title = "名称", dataIndex = "deptName", key = "deptName") private String deptName; + /** + * 编号 + */ + @TableTitle(title = "编号", dataIndex = "deptNo", key = "deptNo") + private String deptNo; + /** * 简称 */ diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index b84dc5f3..c89837c7 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -29,7 +29,8 @@ import lombok.NoArgsConstructor; " t.description," + " t.forbidden_tag", fromSql = " from jcl_org_post_info t inner join jcl_org_post a on t.post_id = a.id ", - orderby = "id desc", + orderby = "post_info_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(index = "0", text = "编辑"), @@ -45,7 +46,7 @@ public class PostInfoTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no") + @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no") private String postInfoNo; /** * 名称 diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 33477e2a..29bc23b3 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -133,4 +133,10 @@ public interface CompMapper { * @param ids */ int deleteByIds(@Param("ids") Collection ids); + + /** + * 获取最大排序 + * @return + */ + int getMaxShowOrder(); } diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 042a8b3f..124ed2cc 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -12,6 +12,7 @@ + @@ -32,6 +33,7 @@ , t.comp_principal , t.description , t.forbidden_tag + , t.show_order , t.creator , t.delete_type , t.create_time @@ -91,6 +93,9 @@ description, forbidden_tag, + + show_order, + @@ -130,6 +135,7 @@ #{description}, 0, + #{showOrder}, @@ -138,7 +144,7 @@ FROM jcl_org_comp t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 order by show_order + update jcl_org_comp @@ -282,6 +292,7 @@ industry=#{industry}, comp_principal=#{compPrincipal}, description=#{description}, + show_order=#{showOrder}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 2912552e..58d26b52 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -103,7 +103,7 @@ SELECT FROM jcl_org_dept t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 order by show_order