Merge pull request 'feature/dxf' (#254) from feature/dxf into develop

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

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -56,7 +56,7 @@ public class StaffPlanTableVO {
     /**
      * w维度
      */
-    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
+    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension" ,multiLanguage = true)
     private String controlDimension;
     /**
      * 年度

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
         operates = {
                 @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
                 @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"),
-                @OrganizationTableOperate(index = "2", text = "变更")
+                @OrganizationTableOperate(index = "2", labelId = 547176, text = "变更")
         }, tableType = WeaTableType.CHECKBOX
 
 )
@@ -48,7 +48,7 @@ public class StaffTableVO {
     /**
      * 维度
      */
-    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
+    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension", multiLanguage = true)
     private String controlDimension;
     /**
      * 分部
@@ -83,7 +83,7 @@ public class StaffTableVO {
     /**
      * 缺编状态
      */
-    @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan")
+    @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "20%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan",multiLanguage = true)
     private String lackStatus;
     /**
      * 编制描述

src/com/engine/organization/enums/ModuleTypeEnum.java

@@ -9,10 +9,10 @@ package com.engine.organization.enums;
  **/
 public enum ModuleTypeEnum implements BaseEnum<Integer> {
 
-    subcompanyfielddefined(1, "分部", -84967),
-    departmentfielddefined(2, "部门", -84967),
-    jobfielddefined(3, "岗位", -84967),
-    resourcefielddefined(4, "人员", -84967);
+    subcompanyfielddefined(1, "分部", 547332),
+    departmentfielddefined(2, "部门", 547331),
+    jobfielddefined(3, "岗位", 547333),
+    resourcefielddefined(4, "人员", 547205);
 
     private int value;
 

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

@@ -279,9 +279,13 @@ public class ChartServiceImpl extends Service implements ChartService {
         if (showJob) {
             // 查询部门下的岗位
             if (isRealTime) {
-                sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "'";
+                String subcompanyid1 = new DepartmentComInfo().getSubcompanyid1(departmentId);
+                sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "' and b.ec_company='" + subcompanyid1 + "'";
             } else {
-                sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and versionid = " + versionId;
+                rs.executeQuery("select subcompanyid from jcl_chart_department where departmentid = '" + departmentId + "' and versionid = " + versionId);
+                rs.next();
+                String subcompanyid = rs.getString("subcompanyid");
+                sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and subcompanyid =  '" + subcompanyid + "' and versionid = " + versionId;
             }
             rs.executeQuery(sql);
             while (rs.next()) {

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

@@ -355,7 +355,7 @@ public class StaffServiceImpl extends Service implements StaffService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         // 方案
-        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, 547459, "162", "planId", "staffPlanBrowser");
+        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 6, 2, false, 547459, "162", "planId", "staffPlanBrowser");
         planIdItem.setRules("required|string");
         planIdItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547343,user.getLanguage()));
         planIdItem.setLabelcol(2);

src/com/engine/organization/transmethod/StaffPlanTransMethod.java

@@ -1,10 +1,12 @@
 package com.engine.organization.transmethod;
 
+import cn.hutool.core.convert.Convert;
 import com.engine.organization.entity.DeleteParam;
 import com.engine.organization.enums.ModuleTypeEnum;
 import com.engine.organization.mapper.staff.StaffPlanMapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.lang3.StringUtils;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.List;
 import java.util.Map;
@@ -33,11 +35,17 @@ public class StaffPlanTransMethod {
     }
 
 
-    public static String getControlDimension(String controlDimension) {
+    public static String getControlDimension(String controlDimension, String languageId) {
+        Integer language = Convert.toInt(languageId, -1);
+
         if (!"".equals(controlDimension)) {
             for (ModuleTypeEnum myEnum : ModuleTypeEnum.values()) {
                 if (myEnum.getValue() == Integer.parseInt(controlDimension)) {
-                    return myEnum.getDefaultLabel();
+                    if (-1 == language) {
+                        return myEnum.getDefaultLabel();
+                    }
+                    Integer labelId = myEnum.getLabelId();
+                    return SystemEnv.getHtmlLabelName(labelId, language);
                 }
             }
         }

src/com/engine/organization/transmethod/StaffTransMethod.java

@@ -1,5 +1,8 @@
 package com.engine.organization.transmethod;
 
+import cn.hutool.core.convert.Convert;
+import weaver.systeminfo.SystemEnv;
+
 /**
  * @description:
  * @author:dxfeng
@@ -8,23 +11,31 @@ package com.engine.organization.transmethod;
  */
 public class StaffTransMethod {
 
-    public static String getLackSpan(String lackStatus) {
+    public static String getLackSpan(String lackStatus, String languageId) {
+        Integer language = Convert.toInt(languageId, -1);
         String lackSpan = "";
+        int labelId = -1;
         switch (lackStatus) {
             case "1":
                 lackSpan = "缺编";
+                labelId = 547351;
                 break;
             case "2":
                 lackSpan = "满员";
+                labelId = 547350;
                 break;
             case "3":
                 lackSpan = "超编";
+                labelId = 547352;
                 break;
             default:
                 break;
 
         }
-        return lackSpan;
+        if (-1 == language || -1 == labelId) {
+            return lackSpan;
+        }
+        return SystemEnv.getHtmlLabelName(labelId, language);
     }
 
 }