Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

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

@@ -128,7 +128,7 @@
         c.id,c.jobtitlename,e.level_name,f.grade_name, nvl( b.id, '' ) +200000000,b.id,
         0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
         from hrmresource a
-        left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
+        left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle and a.subcompanyid1=b.ec_company and a.departmentid=b.ec_department
         left join HrmJobTitles c on b.ec_jobTitle = c.id
         left join cus_fielddata d on a.id = d.id and d.scope='HrmCustomFieldByInfoType' and d.scopeid=3
         left join jcl_org_level e on d.field3=e.id
@@ -189,8 +189,11 @@
         where plan_id in (select id from JCL_ORG_STAFFPLAN
         where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd')) 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 nvl(a.delete_type,0) <> 1 and nvl(a.forbidden_tag,0) <> 1
     </insert>

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

@@ -93,10 +93,10 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 list = getCompanyVersionMapper().getSubComVersionList(id, version);
                 for (HrmSubCompanyVersion hrmSubCompanyVersion : list) {
                     datas.add(VersionData.builder().fieldId("分部简称").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyName())).build());
-                    datas.add(VersionData.builder().fieldId("分部描述").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyDesc())).build());
+                    datas.add(VersionData.builder().fieldId("分部全称").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyDesc())).build());
                     datas.add(VersionData.builder().fieldId("上级分部").fieldValue(Util.null2String(hrmSubCompanyVersion.getSupSubComName())).build());
                     datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmSubCompanyVersion.getVersion()))).build());
-                    datas.add(VersionData.builder().fieldId("分部编码").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
+                    datas.add(VersionData.builder().fieldId("分部编号").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
                     datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmSubCompanyVersion.getShowOrder())).build());
                     operateName = hrmSubCompanyVersion.getOperator();
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -121,7 +121,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 for (HrmDepartmentVersion hrmDepartmentVersion : deptVersionList) {
                     datas.add(VersionData.builder().fieldId("部门编号").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentCode())).build());
                     datas.add(VersionData.builder().fieldId("部门简称").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentName())).build());
-                    datas.add(VersionData.builder().fieldId("部门标识").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentMark())).build());
+                    datas.add(VersionData.builder().fieldId("部门全称").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentMark())).build());
                     datas.add(VersionData.builder().fieldId("所属分部").fieldValue(Util.null2String(hrmDepartmentVersion.getSubcompanyname())).build());
                     datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepName())).build());
                     datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzrName())).build());