sqlserver版本存入、部门转移

src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java

@@ -44,4 +44,6 @@ public interface JclOrgMapper {
 
     int insertComToMap();
 
+    int deleteJobNull();
+
 }

src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml

@@ -151,8 +151,11 @@
         where plan_id in (select id from JCL_ORG_STAFFPLAN
         where time_start <= convert(varchar(100),getDate(),23) and time_end > convert(varchar(100),getDate(),23)) and delete_type=0
         group by job_id) e on a.id=e.job_id
-        left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f
-        on f.JOBTITLE=a.ec_jobTitle
+        left join ( select  c.id,count(1) fcnt from hrmresource a
+                                                        left join Hrmjobtitles b on a.jobtitle=b.id
+                                                        left join jcl_org_job c on b.id=c.ec_jobtitle and a.subcompanyid1=c.ec_company and a.departmentid=c.ec_department
+                    group by c.id) f
+                  on f.id=a.id
         left join HrmJobTitles g on a.ec_jobTitle = g.id
         where isnull(a.delete_type,0) <> 1 and isnull(a.forbidden_tag,0) <> 1
     </insert>
@@ -316,5 +319,8 @@
                0, NULL, NULL, 0, NULL, -1, 0,
                0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany
     </insert>
+    <delete id="deleteJobNull">
+        delete from jcl_org_map where ftype=3 and fonjob=0
+    </delete>
 
 </mapper>

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

@@ -39,9 +39,9 @@
 
     <insert id="insertHrmSubComVersion">
         insert into hrmsubcompany_version
-        (id, subcomid ,subcompanydesc ,subcompanycode ,subcompanyname ,supsubcomid ,
+        (subcomid ,subcompanydesc ,subcompanycode ,subcompanyname ,supsubcomid ,
          showorder ,canceled ,description ,operator ,version ,operate_time)
-        values (#{id},#{subComId}, #{subCompanyDesc}, #{subCompanyCode}, #{subCompanyName}, #{supSubComId},
+        values (#{subComId}, #{subCompanyDesc}, #{subCompanyCode}, #{subCompanyName}, #{supSubComId},
                 #{showOrder}, #{canceled}, #{description}, #{operator}, #{version}, #{operateTime})
     </insert>
 
@@ -57,9 +57,9 @@
 
     <insert id="insertHrmDeptVersion">
         insert into hrmdepartment_version
-            (id,departmentid, departmentmark, departmentcode, departmentname, subcompanyid1, supdepid,
+            (departmentid, departmentmark, departmentcode, departmentname, subcompanyid1, supdepid,
              bmfzr, showorder, canceled, description, operator, version, operate_time)
-             VALUES (#{id},#{departmentId}, #{departmentMark}, #{departmentCode}, #{departmentName}, #{subCompanyId1}, #{supDepId},
+             VALUES (#{departmentId}, #{departmentMark}, #{departmentCode}, #{departmentName}, #{subCompanyId1}, #{supDepId},
                      #{bmfzr}, #{showOrder}, #{canceled}, #{description}, #{operator}, #{version}, #{operateTime})
     </insert>
     <select id="getMaxHrmVersion" resultType="com.engine.organization.entity.version.HrmResourceVersion">

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

@@ -376,6 +376,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         result.put("data", currentList);
         return result;
     }
+    //处理多个部门负责人
+    private Map<String, Object> getBmfzrInfo (String bmfzr){
+
+        return null;
+    }
 
 
     private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
@@ -535,6 +540,9 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             int id = jclOrgMap.getId();
             countJobAndPlans("3",id,currentDate);
         }
+
+        //清除部门合并、转移造成的脏数据
+        getJclOrgMapMapper().deleteJobNull();
         return "同步成功";
     }
     /**