Merge pull request 'Oracle版本BUG修复' (#105) from feature/dxf into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/105

src/com/engine/organization/mapper/version/CompanyVersionMapper.xml

@@ -62,19 +62,6 @@
              VALUES (#{id},#{departmentId}, #{departmentMark}, #{departmentCode}, #{departmentName}, #{subCompanyId1}, #{supDepId},
                      #{bmfzr}, #{showOrder}, #{canceled}, #{description}, #{operator}, #{version}, #{operateTime})
     </insert>
-    <insert id="insertHrmDeptVersion" keyColumn="ID" keyProperty="id" parameterType="com.engine.organization.entity.version.HrmDepartmentVersion" useGeneratedKeys="true" databaseId="oracle">
-        insert into HRMDEPARTMENT_VERSION
-        ( ID,DEPARTMENTID,DEPARTMENTMARK
-        ,DEPARTMENTCODE,DEPARTMENTNAME,SUBCOMPANYID1
-        ,SUPDEPID,BMFZR,SHOWORDER
-        ,CANCELED,DESCRIPTION,OPERATOR
-        ,VERSION,OPERATE_TIME)
-        values (#{id,jdbcType=DECIMAL},#{departmentId,jdbcType=DECIMAL},#{departmentMark,jdbcType=VARCHAR}
-               ,#{departmentCode,jdbcType=VARCHAR},#{departmentName,jdbcType=VARCHAR},#{subCompanyId1,jdbcType=DECIMAL}
-               ,#{supDepId,jdbcType=DECIMAL},#{bmfzr,jdbcType=VARCHAR},#{showOrder,jdbcType=DECIMAL}
-               ,#{canceled,jdbcType=DECIMAL},#{description,jdbcType=VARCHAR},#{operator,jdbcType=VARCHAR}
-               ,#{version,jdbcType=DECIMAL},#{operateTime,jdbcType=TIMESTAMP})
-    </insert>
     <select id="getMaxHrmVersion" resultType="com.engine.organization.entity.version.HrmResourceVersion">
         select * from hrmresource_version where resourceid=#{resourceid} order by version desc limit 1
     </select>
@@ -85,7 +72,7 @@
         select top  1 * from hrmresource_version where resourceid=#{resourceid} order by version desc
     </select>
 
-    <insert id="insertHrmResourceVersion" keyColumn="id" keyProperty="id" parameterType="com.engine.organization.entity.version.HrmResourceVersion" useGeneratedKeys="true">
+    <insert id="insertHrmResourceVersion"  parameterType="com.engine.organization.entity.version.HrmResourceVersion">
         insert into hrmresource_version
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -244,61 +231,7 @@
             <if test="operateTime != null">#{operateTime,jdbcType=TIMESTAMP},</if>
         </trim>
     </insert>
-    <insert id="insertHrmResourceVersion" keyColumn="ID" keyProperty="id" parameterType="com.engine.organization.entity.version.HrmResourceVersion" useGeneratedKeys="true" databaseId="oracle">
-        insert into HRMRESOURCE_VERSION
-        ( ID,RESOURCEID,COMPANYSTARTDATE
-        ,COMPANYWORKYEAR,WORKSTARTDATE,WORKYEAR
-        ,USEKIND,JOBCALL,ACCUMFUNDACCOUNT
-        ,BIRTHPLACE,FOLK,RESIDENTPHONE
-        ,RESIDENTPOSTCODE,EXTPHONE,MANAGERSTR
-        ,STATUS,FAX,ISLABOUUNION
-        ,WEIGHT,TEMPRESIDENTNUMBER,PROBATIONENDDATE
-        ,COUNTRYID,PASSWDCHGDATE,LLOGINID
-        ,DSPORDER,PASSWORDSTATE,ACCOUNTTYPE
-        ,BELONGTO,MESSAGERURL,ACCOUNTNAME
-        ,LOGINID,PASSWORD,LASTNAME
-        ,SEX,BIRTHDAY,NATIONALITY
-        ,MARITALSTATUS,TELEPHONE,MOBILE
-        ,MOBILECALL,EMAIL,LOCATIONID
-        ,WORKROOM,HOMEADDRESS,RESOURCETYPE
-        ,STARTDATE,ENDDATE,JOBTITLE
-        ,JOBACTIVITYDESC,JOBLEVEL,SECLEVEL
-        ,DEPARTMENTID,SUBCOMPANYID1,COSTCENTERID
-        ,MANAGERID,ASSISTANTID,BANKID1
-        ,ACCOUNTID1,RESOURCEIMAGEID,CERTIFICATENUM
-        ,NATIVEPLACE,EDUCATIONLEVEL,BEMEMBERDATE
-        ,BEPARTYDATE,WORKCODE,REGRESIDENTPLACE
-        ,HEALTHINFO,RESIDENTPLACE,POLICY
-        ,DEGREE,HEIGHT,CLASSIFICATION
-        ,DESCRIPTION,OPERATOR,VERSION
-        ,OPERATE_TIME)
-        values (#{id,jdbcType=DECIMAL},#{resourceid,jdbcType=DECIMAL},#{companystartdate,jdbcType=TIMESTAMP}
-               ,#{companyworkyear,jdbcType=DECIMAL},#{workstartdate,jdbcType=TIMESTAMP},#{workyear,jdbcType=DECIMAL}
-               ,#{usekind,jdbcType=DECIMAL},#{jobcall,jdbcType=DECIMAL},#{accumfundaccount,jdbcType=VARCHAR}
-               ,#{birthplace,jdbcType=VARCHAR},#{folk,jdbcType=VARCHAR},#{residentphone,jdbcType=VARCHAR}
-               ,#{residentpostcode,jdbcType=VARCHAR},#{extphone,jdbcType=VARCHAR},#{managerstr,jdbcType=VARCHAR}
-               ,#{status,jdbcType=DECIMAL},#{fax,jdbcType=VARCHAR},#{islabouunion,jdbcType=CHAR}
-               ,#{weight,jdbcType=DECIMAL},#{tempresidentnumber,jdbcType=VARCHAR},#{probationenddate,jdbcType=TIMESTAMP}
-               ,#{countryid,jdbcType=DECIMAL},#{passwdchgdate,jdbcType=TIMESTAMP},#{lloginid,jdbcType=VARCHAR}
-               ,#{dsporder,jdbcType=FLOAT},#{passwordstate,jdbcType=DECIMAL},#{accounttype,jdbcType=DECIMAL}
-               ,#{belongto,jdbcType=DECIMAL},#{messagerurl,jdbcType=VARCHAR},#{accountname,jdbcType=VARCHAR}
-               ,#{loginid,jdbcType=VARCHAR},#{password,jdbcType=VARCHAR},#{lastname,jdbcType=VARCHAR}
-               ,#{sex,jdbcType=CHAR},#{birthday,jdbcType=CHAR},#{nationality,jdbcType=DECIMAL}
-               ,#{maritalstatus,jdbcType=CHAR},#{telephone,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR}
-               ,#{mobilecall,jdbcType=VARCHAR},#{email,jdbcType=VARCHAR},#{locationid,jdbcType=DECIMAL}
-               ,#{workroom,jdbcType=VARCHAR},#{homeaddress,jdbcType=VARCHAR},#{resourcetype,jdbcType=CHAR}
-               ,#{startdate,jdbcType=TIMESTAMP},#{enddate,jdbcType=TIMESTAMP},#{jobtitle,jdbcType=DECIMAL}
-               ,#{jobactivitydesc,jdbcType=VARCHAR},#{joblevel,jdbcType=DECIMAL},#{seclevel,jdbcType=DECIMAL}
-               ,#{departmentid,jdbcType=DECIMAL},#{subcompanyid1,jdbcType=DECIMAL},#{costcenterid,jdbcType=DECIMAL}
-               ,#{managerid,jdbcType=DECIMAL},#{assistantid,jdbcType=DECIMAL},#{bankid1,jdbcType=DECIMAL}
-               ,#{accountid1,jdbcType=VARCHAR},#{resourceimageid,jdbcType=DECIMAL},#{certificatenum,jdbcType=VARCHAR}
-               ,#{nativeplace,jdbcType=VARCHAR},#{educationlevel,jdbcType=DECIMAL},#{bememberdate,jdbcType=TIMESTAMP}
-               ,#{bepartydate,jdbcType=TIMESTAMP},#{workcode,jdbcType=VARCHAR},#{regresidentplace,jdbcType=VARCHAR}
-               ,#{healthinfo,jdbcType=CHAR},#{residentplace,jdbcType=VARCHAR},#{policy,jdbcType=VARCHAR}
-               ,#{degree,jdbcType=VARCHAR},#{height,jdbcType=VARCHAR},#{classification,jdbcType=CHAR}
-               ,#{description,jdbcType=VARCHAR},#{operator,jdbcType=VARCHAR},#{version,jdbcType=DECIMAL}
-               ,#{operateTime,jdbcType=TIMESTAMP})
-    </insert>
+
 
     <select id="getHrmSubComp" resultType="com.engine.organization.entity.version.HrmSubCompanyDto">
         select id ,subcompanyname, subcompanydesc,companyid,supsubcomid,url,canceled,subcompanycode,outkey,showorder from HrmSubCompany