导入问题处理

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -162,7 +162,7 @@
         'hrmresource' as tablename
         from hrm_formfield a
         inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-        where a.fielddbtype != '6'
+        where a.fielddbtype != '6' and a.isuse = '1'
         and a.fieldname in
         <foreach collection="fields" open="(" item="field" separator="," close=")">
             #{field}

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

@@ -153,8 +153,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
             mergeList.addAll(hrmFieldBeanList);
             mergeList.addAll(customFieldList);
 
+            // TODO 分部、部门
             List<FieldTypeTreeParam> fieldDatas = mergeList.stream().map(item -> FieldTypeTreeParam.builder().id(item.getFieldId()).name(item.getFieldLabel()).build()).collect(Collectors.toList());
-            List<Long> selectedKeys = mergeList.stream().filter(item -> ("1".equals(item.getRequired()) || "hrmresource".equals(item.getTableName()))).map(CusFormFieldPO::getFieldId).collect(Collectors.toList());
+            List<Long> selectedKeys = mergeList.stream().filter(item -> ("1".equals(item.getRequired()) || "subcompanyid1".equals(item.getFieldName()) || "departmentid".equals(item.getFieldName()))).map(CusFormFieldPO::getFieldId).collect(Collectors.toList());
 
             returnMaps.put("data", fieldDatas);
             returnMaps.put("selectedKeys", selectedKeys);
@@ -657,6 +658,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                 if (StringUtils.isBlank(Util.null2String(map.get("forbidden_tag")))) {
                     map.put("forbidden_tag", 0);
                 }
+                String showOrder = Util.null2String(map.get("show_order"));
+                if (StringUtils.isBlank(showOrder)) {
+                    Integer maxShowOrder = MapperProxyFactory.getProxy(CompMapper.class).getMaxShowOrder();
+                    if (null == maxShowOrder) {
+                        maxShowOrder = 0;
+                    }
+                    map.put("show_order", maxShowOrder + 1);
+                }
 
                 Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, map, false).sync();
                 if (isThrowError(syncMap)) {
@@ -861,7 +870,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                 if (StringUtils.isBlank(Util.null2String(map.get("forbidden_tag")))) {
                     map.put("forbidden_tag", 0);
                 }
-
+                String showOrder = Util.null2String(map.get("show_order"));
+                if (StringUtils.isBlank(showOrder)) {
+                    Integer maxShowOrder = MapperProxyFactory.getProxy(DepartmentMapper.class).getMaxShowOrder();
+                    if (null == maxShowOrder) {
+                        maxShowOrder = 0;
+                    }
+                    map.put("show_order", maxShowOrder + 1);
+                }
                 Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.ADD, map, false).sync();
                 if (isThrowError(syncMap)) {
                     // 查询UUID
@@ -1093,6 +1109,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                 if (StringUtils.isBlank(Util.null2String(map.get("forbidden_tag")))) {
                     map.put("forbidden_tag", 0);
                 }
+                String showOrder = Util.null2String(map.get("show_order"));
+                if (StringUtils.isBlank(showOrder)) {
+                    Integer maxShowOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder();
+                    if (null == maxShowOrder) {
+                        maxShowOrder = 0;
+                    }
+                    map.put("show_order", maxShowOrder + 1);
+                }
                 ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_JOB").params(map).build();
 
                 map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID);

src/com/engine/organization/util/saveimport/hrmimport/HrmImportAdaptExcelE9.java

@@ -282,8 +282,9 @@ public class HrmImportAdaptExcelE9 extends BaseBean implements IHrmImportAdapt {
                     cellValue = getCellValue(cell).trim();
                     for (int k = 0; k < temFields.length; k++) {
                         if (cellValue.equals(temFields[k])) {
-                            // 初始化必填字段下标
+                            // TODO 初始化必填字段下标
                             String requiredFields = "所属分部,部门,姓名,岗位,职务,职务类别,办公地点";
+                            requiredFields = "所属分部,部门,登录名,姓名,性别,状态,办公地点,入职日期,参加工作日期,担任岗位,职等职级,担任职务";
                             List<String> requiredFieldList = Arrays.asList(requiredFields.split(","));
 
                             if (requiredFieldList.contains(cellValue)) {