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

!18 BUG修复 表结构更新 

Merge pull request !18 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-05-24 07:16:42 +00:00 committed by Gitee
parent 273b3217c3 01ab659ef3
commit 33f1280579
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 103 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/表结构SQL/MySQL.sql
View File

@ -339,12 +339,12 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 (
-- JCL_ORG_STAFFPLAN
CREATE TABLE JCL_ORG_STAFFPLAN (
id int auto_increment NOT NULL,
staffplan_no varchar(100) NULL,
staffplan_name varchar(100) NULL,
staffplan_year varchar(100) NULL,
plan_no varchar(100) NULL,
plan_name varchar(100) NULL,
plan_year varchar(100) NULL,
time_start date NULL,
time_end date NULL,
apply_company int NULL,
company_id varchar(100) NULL,
description text NULL,
status int NULL,
creator int null,
@ -357,17 +357,17 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
-- JCL_ORG_STAFF
CREATE TABLE JCL_ORG_STAFF (
id int auto_increment NOT NULL,
scheme_id int null,
comp int null,
dept int null,
job int null,
plan_id int null,
comp_id int null,
dept_id int null,
job_id int null,
staff_num int null,
control_policy int null,
staff_permanent_num int null,
freeze_num int null,
lack_status int null,
staff_description varchar(100) NULL,
instruction text null,
description text null,
creator int null,
delete_type int null,
create_time date null,

18
docs/表结构SQL/Oracle.sql
View File

@ -340,12 +340,12 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 (
-- JCL_ORG_STAFFPLAN
CREATE TABLE JCL_ORG_STAFFPLAN (
ID NUMBER NOT NULL,
STAFFPLAN_NO NVARCHAR2(100) NULL,
STAFFPLAN_NAME NVARCHAR2(100) NULL,
STAFFPLAN_YEAR NVARCHAR2(100) NULL,
PLAN_NO NVARCHAR2(100) NULL,
PLAN_NAME NVARCHAR2(100) NULL,
PLAN_YEAR NVARCHAR2(100) NULL,
TIME_START DATE NULL,
TIME_END DATE NULL,
APPLY_COMPANY NUMBER NULL,
COMPANY_ID NVARCHAR2(100) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
STATUS NUMBER NULL,
CREATOR NUMBER NULL,
@ -358,17 +358,17 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
-- JCL_ORG_STAFF
CREATE TABLE JCL_ORG_STAFF (
ID NUMBER NOT NULL,
SCHEME_ID NUMBER NULL,
COMP NUMBER NULL,
DEPT NUMBER NULL,
JOB NUMBER NULL,
PLAN_ID NUMBER NULL,
COMP_ID NUMBER NULL,
DEPT_ID NUMBER NULL,
JOB_ID NUMBER NULL,
STAFF_NUM NUMBER NULL,
CONTROL_POLICY NUMBER NULL,
STAFF_PERMANENT_NUM NUMBER NULL,
FREEZE_NUM NUMBER NULL,
LACK_STATUS NUMBER NULL,
STAFF_DESCRIPTION NVARCHAR2(100) NULL,
INSTRUCTION NVARCHAR2(1000) NULL,
DESCRIPTION NVARCHAR2(1000) NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,
CREATE_TIME DATE NULL,

18
docs/表结构SQL/SqlServer.sql
View File

@ -339,12 +339,12 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 (
-- JCL_ORG_STAFFPLAN
CREATE TABLE JCL_ORG_STAFFPLAN (
id int IDENTITY(1,1) NOT NULL,
staffplan_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
staffplan_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
staffplan_year varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
plan_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
plan_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
plan_year varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
time_start date NULL,
time_end date NULL,
apply_company int NULL,
company_id varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
description text NULL,
status int NULL,
creator int null,
@ -357,17 +357,17 @@ CREATE TABLE JCL_ORG_STAFFPLAN (
-- JCL_ORG_STAFF
CREATE TABLE JCL_ORG_STAFF (
id int IDENTITY(1,1) NOT NULL,
scheme_id int null,
comp int null,
dept int null,
job int null,
plan_id int null,
comp_id int null,
dept_id int null,
job_id int null,
staff_num int null,
control_policy int null,
staff_permanent_num int null,
freeze_num int null,
lack_status int null,
staff_description varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
instruction text null,
description text null,
creator int null,
delete_type int null,
create_time date null,

62
src/com/engine/organization/entity/staff/po/StaffPlanPO.java Normal file
View File

@ -0,0 +1,62 @@
package com.engine.organization.entity.staff.po;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @description: TODO
* @author:dxfeng
* @createTime: 2022/05/24
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class StaffPlanPO {
/**
* 主键
*/
private Long id;
/**
* 编号
*/
private String planNo;
/**
* 名称
*/
private String planName;
/**
* 年度
*/
private Integer planYear;
/**
* 时间开始
*/
private Date time_start;
/**
* 时间结束
*/
private Date time_end;
/**
* 适用公司
*/
private String companyId;
/**
* 说明
*/
private String description;
/**
* 状态
*/
private Integer forbiddenTag;
private Long creator;
private int deleteType;
private Date createTime;
private Date updateTime;
}

2
src/com/engine/organization/mapper/scheme/LevelMapper.xml
View File

@ -42,7 +42,7 @@
from jcl_org_level t where level_no = #{levelNo} AND delete_type = 0
</select>
<select id="getCountByTag" resultType="java.lang.Integer">
select count(1) from jcl_org_level where 1=1 AND delete_type = 0
select count(1) from jcl_org_level where delete_type = 0
<if test=" tag != -1 " >
and forbidden_tag = #{tag}
</if>

14
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -77,7 +77,7 @@ public class CompServiceImpl extends Service implements CompService {
Map<String, Object> datas = new HashMap<>();
PageUtil.start(params.getCurrent(), params.getPageSize());
List<CompPO> parentList = getCompMapper().listParent();
PageInfo<CompPO> pageInfo = new PageInfo<>(parentList);
List<CompPO> list = new ArrayList<>();
list.addAll(parentList);
@ -91,6 +91,7 @@ public class CompServiceImpl extends Service implements CompService {
List<CompPO> filterList = filterListByParams(list, compPO);
List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(list, filterList);
PageInfo<CompListDTO> pageInfo = new PageInfo<>(compListDTOS);
PageInfo<CompListDTO> pageInfos = new PageInfo<>(compListDTOS, CompListDTO.class);
pageInfos.setTotal(pageInfo.getTotal());
pageInfos.setPageNum(params.getCurrent());
@ -100,14 +101,12 @@ public class CompServiceImpl extends Service implements CompService {
List<Column> columns = pageInfos.getColumns();
List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList());
table.setColumns(weaTableColumn);
WeaResultMsg result = new WeaResultMsg(false);
result.putAll(table.makeDataResult());
result.success();
datas.put("pageInfo", pageInfos);
datas.put("dataKey", result.getResultMap());
return datas;
@ -265,13 +264,16 @@ public class CompServiceImpl extends Service implements CompService {
compNameShortItem.setRules("required|string");
// TODO 自定义按钮
// 上级公司
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser");
SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "上级公司", "161", "parentCompany", "compBrowser");
compBrowserItem.setRules("required|string");
// 组织机构代码
SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "组织机构代码", "orgCode");
SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "组织机构代码", "orgCode");
orgCodeItem.setRules("required|string");
// 行业
SearchConditionItem industryItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "行业", "63", "industry", "");
// 负责人
SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "负责人", "1", "compPrincipal", "");
SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "负责人", "1", "compPrincipal", "");
compPrincipalItem.setRules("required|string");
// 说明
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description");

3
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -58,7 +58,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
Map<String, Object> datas = new HashMap<>();
PageUtil.start(param.getCurrent(), param.getPageSize());
List<DepartmentPO> parentList = getDepartmentMapper().listParent();
PageInfo<DepartmentPO> pageInfo = new PageInfo<>(parentList);
List<DepartmentPO> list = new ArrayList<>();
list.addAll(parentList);
@ -71,6 +70,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
List<DepartmentPO> filterList = filterListByParams(list, departmentPO);
List<DepartmentListDTO> departmentListDTOS = DepartmentBO.buildDeptDTOList(list, filterList);
PageInfo<DepartmentListDTO> pageInfo = new PageInfo<>(departmentListDTOS);
PageInfo<DepartmentListDTO> pageInfos = new PageInfo<>(departmentListDTOS, DepartmentListDTO.class);
pageInfos.setTotal(pageInfo.getTotal());
pageInfos.setPageNum(param.getCurrent());

2
src/com/engine/organization/service/impl/GradeServiceImpl.java
View File

@ -114,7 +114,9 @@ public class GradeServiceImpl extends Service implements GradeService {
gradeNoCondition.setRules("required|string");
SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
schemeBrowserItem.setRules("required|string");
SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "162", "levelId", "LevelBrowser");
levelBrowserItem.setRules("required|string");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));

1
src/com/engine/organization/service/impl/LevelServiceImpl.java
View File

@ -109,6 +109,7 @@ public class LevelServiceImpl extends Service implements LevelService {
levelNoCondition.setRules("required|string");
SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
browserItem.setRules("required|string");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));