1.协作操作-生成定调薪信息字段优化

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/explugin/BatchEffectServiceExtendEx.java

@@ -52,6 +52,9 @@ public class BatchEffectServiceExtendEx implements IBatchEffectServiceExtend {
                     .map(dyx -> dyx.getString("structlongnumber"))
                     .flatMap(longNumber -> Arrays.stream(longNumber.split("!")))
                     .collect(Collectors.toSet());
+            Set set1 = Arrays.asList(structLongNumber.split("!")).stream().collect(Collectors.toSet());
+            structLongNumberSet.addAll(set1);
+            structLongNumberSet.remove(structNumber);
             Map<String, Map<String, String>> structMap = OrgUtils.getStructNumberMap(structLongNumberSet, null);
             //把本次修改的组织加进structMap
             structMap.put(structNumber, map);

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hrmp/hbpm/task/SyncAdminOrgTask.java

@@ -366,7 +366,11 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             QFilter filter = new QFilter("orgchgentry.operationtime", ">=", sdf.parse(startTime));
             filter.and("orgchgentry.operationtime", "<", sdf.parse(endTime));
-            filter.and("orgchgentry.subentryentity.chgpageelement", QCP.not_equals2, "index");
+
+            QFilter filter1 = new QFilter("orgchgentry.subentryentity.chgpageelement", QCP.not_equals2, "index");
+            filter1.or("orgchgentry.subentryentity.chgpageelement", QCP.is_null, "");
+
+            filter.and(filter1);
             //filter.and("org.otclassify", "=", 1010L);
             //filter.and("adminorg.number", QCP.equals, "JY-20240612-0009");
             log.info("-------- 查询组织变化过滤条件：" + filter.toString() + " --------");

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hcdm/formplugin/web/AdjustJobBillEffectOp.java

@@ -84,6 +84,7 @@ public class AdjustJobBillEffectOp extends AbstractOperationServicePlugIn implem
             }
         }
 
+        //职级生效
         ScheduleExecutor scheduleExecutor = new ScheduleExecutor();
         scheduleExecutor.setJobCustomParams("5/BIP+ZNTT/6", new HashMap(4));
         scheduleExecutor.dispatch("5/BIRZNR2F16", ScheduleExecutor.isSerialWithJobTask("5/BIP+ZNTT/6"));
@@ -126,10 +127,14 @@ public class AdjustJobBillEffectOp extends AbstractOperationServicePlugIn implem
         relperson_data.put("personname", relPerson.getString("personname"));
         relperson_data.put("empnumber", relPerson.getString("empnumber"));
         relperson_data.put("org", relPerson.getLong("org.id"));
+        relperson_data.put("adminorg", relPerson.getLong("adminorg.id"));
+        relperson_data.put("assoadminorg", relPerson.getLong("assoadminorg.id"));
         relperson_data.put("depemp", relPerson.getLong("depemp.id"));
         relperson_data.put("country", 1000001L);
         relperson_data.put("joblevel",relPerson.getLong("joblevel.id"));
         relperson_data.put("salaystructure", relPerson.getLong("salaystructure.id"));
+        relperson_data.put("stdscm", relPerson.getLong("stdscm.id"));
+        relperson_data.put("empgroup", 1090L);
         info.put("relperson_data", relperson_data);
         list.add(info);
         return list;

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hsas/formplugin/web/helper/AdjSalFileHelper.java

@@ -222,6 +222,8 @@ public class AdjSalFileHelper {
         //行政组织
         relperson_data.put("adminorg", salaryAdjFile.getLong("adminorg.id"));
         relperson_data.put("assoadminorg", salaryAdjFile.getLong("adminorg.id"));
+        //薪酬管理人员组
+        relperson_data.put("empgroup", 1090L);
         map.put("relperson_data", relperson_data);
     }