人员导入

docs/表结构SQL/MySQL.sql

@@ -325,13 +325,46 @@ CREATE TABLE JCL_ORG_HRMRESOURCE (
     fax varchar(60) null,
     email varchar(60) null,
     workroom varchar(60) null,
+    pass_word varchar(100) null,
+    sec_level int null,
+    birthday char(10) null,
+    folk varchar(30) null,
+    native_place varchar(100) null,
+    reg_resident_place varchar(200) null,
+    certificate_num varchar(60) null,
+    marital_status char(1) null,
+    policy varchar(30) null,
+    be_member_date char(10) null,
+    be_party_date char(10) null,
+    islabouunion char(1) null,
+    degree varchar(30) null,
+    health_info char(1) null,
+    education_level int null,
+    height varchar(10) null,
+    weight int null,
+    use_kind int null,
+    start_date char(10) null,
+    end_date char(10) null,
+    probation_end_date char(10) null,
+    resident_place varchar(200) null,
+    home_address varchar(100) null,
+    temp_resident_number varchar(60) null,
+    company_start_date varchar(10) null,
+    work_start_date varchar(10) null,
+    accum_fund_account varchar(30) null,
+    account_name varchar(200) null,
+    bank_id int null,
+    account_id varchar(100) null,
+    show_order int null,
+    classification char(1) null,
+    company_work_year decimal(10,2) null,
+    work_year decimal(10,2) 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,

docs/表结构SQL/Oracle.sql

@@ -327,6 +327,40 @@ CREATE TABLE JCL_ORG_HRMRESOURCE (
     FAX NVARCHAR2(60) NULL,
     EMAIL NVARCHAR2(60) NULL,
     WORKROOM NVARCHAR2(60) NULL,
+    PASS_WORD NVARCHAR2(100) NULL,
+    SEC_LEVEL NUMBER NULL,
+    BIRTHDAY CHAR(10) NULL,
+    FOLK NVARCHAR2(30) NULL,
+    NATIVE_PLACE NVARCHAR2(100) NULL,
+    REG_RESIDENT_PLACE NVARCHAR2(200) NULL,
+    CERTIFICATE_NUM NVARCHAR2(60) NULL,
+    MARITAL_STATUS CHAR(1) NULL,
+    POLICY NVARCHAR2(30) NULL,
+    BE_MEMBER_DATE CHAR(10) NULL,
+    BE_PARTY_DATE CHAR(10) NULL,
+    ISLABOUUNION CHAR(1) NULL,
+    DEGREE NVARCHAR2(30) NULL,
+    HEALTH_INFO CHAR(1) NULL,
+    EDUCATION_LEVEL NUMBER NULL,
+    HEIGHT NVARCHAR2(10) NULL,
+    WEIGHT NUMBER NULL,
+    USE_KIND NUMBER NULL,
+    START_DATE CHAR(10) NULL,
+    END_DATE CHAR(10) NULL,
+    PROBATION_END_DATE CHAR(10) NULL,
+    RESIDENT_PLACE NVARCHAR2(200) NULL,
+    HOME_ADDRESS NVARCHAR2(100) NULL,
+    TEMP_RESIDENT_NUMBER NVARCHAR2(60) NULL,
+    COMPANY_START_DATE NVARCHAR2(10) NULL,
+    WORK_START_DATE NVARCHAR2(10) NULL,
+    ACCUM_FUND_ACCOUNT NVARCHAR2(30) NULL,
+    ACCOUNT_NAME NVARCHAR2(200) NULL,
+    BANK_ID NUMBER NULL,
+    ACCOUNT_ID NVARCHAR2(100) NULL,
+    SHOW_ORDER NUMBER NULL,
+    CLASSIFICATION CHAR(1) NULL,
+    COMPANY_WORK_YEAR DECIMAL(10,2) NULL,
+    WORK_YEAR DECIMAL(10,2) NULL,
     CREATOR NUMBER NULL,
     DELETE_TYPE NUMBER NULL,
     CREATE_TIME DATE NULL,

docs/表结构SQL/SqlServer.sql

@@ -325,6 +325,40 @@ CREATE TABLE JCL_ORG_HRMRESOURCE (
     fax varchar(60) null,
     email varchar(60) null,
     workroom varchar(60) null,
+    pass_word varchar(100) null,
+    sec_level int null,
+    birthday char(10) null,
+    folk varchar(30) null,
+    native_place varchar(100) null,
+    reg_resident_place varchar(200) null,
+    certificate_num varchar(60) null,
+    marital_status char(1) null,
+    policy varchar(30) null,
+    be_member_date char(10) null,
+    be_party_date char(10) null,
+    islabouunion char(1) null,
+    degree varchar(30) null,
+    health_info char(1) null,
+    education_level int null,
+    height varchar(10) null,
+    weight int null,
+    use_kind int null,
+    start_date char(10) null,
+    end_date char(10) null,
+    probation_end_date char(10) null,
+    resident_place varchar(200) null,
+    home_address varchar(100) null,
+    temp_resident_number varchar(60) null,
+    company_start_date varchar(10) null,
+    work_start_date varchar(10) null,
+    accum_fund_account varchar(30) null,
+    account_name varchar(200) null,
+    bank_id int null,
+    account_id varchar(100) null,
+    show_order int null,
+    classification char(1) null,
+    company_work_year decimal(10,2) null,
+    work_year decimal(10,2) null,
     creator int null,
     delete_type int null,
     create_time datetime null,

src/com/engine/organization/service/impl/HrmResourceImportProcessServiceImpl.java

@@ -662,7 +662,8 @@ public class HrmResourceImportProcessServiceImpl extends Service implements HrmR
 
 
                         ////id，非自动增长
-                        id = getResourceMapper().getMaxId() + 1;
+                        Long maxId = getResourceMapper().getMaxId();
+                        id = null == maxId ? 1 : maxId + 1;
                         hrmResourcePO.setId(id);
 
 
@@ -761,7 +762,7 @@ public class HrmResourceImportProcessServiceImpl extends Service implements HrmR
                                 }
                             }
                         }
-                        insertStr = insertStr + insertFields + "creator,delete_type,create_time,update_time) values(" + insertValues + createrid + ",'" + 0 + "','" + date + "','" + date + "')";
+                        insertStr = insertStr + insertFields + "creator,delete_type,create_time) values(" + insertValues + createrid + ",'" + 0 + "','" + date + "')";
                         boolean resourceInsertFlag = true;
                         if (!execSql(insertStr)) {//添加人员信息
                             flag = false;