MDM同步代码

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/staff/plugin/task/SyncAdminOrgTask.java

@@ -54,7 +54,7 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin {
             JSONObject ob = new JSONObject();
             initDateRange(map);
             HRBaseServiceHelper helper = new HRBaseServiceHelper(orgChgRecord_entity);
-            String selectProperties = "adminorg,orgchgentry.changescene.number,createtime";
+            String selectProperties = "adminorg,orgchgentry.changescene.number,orgchgentry.operationtime";
             //查出发生过变化的组织
             DynamicObjectCollection changeOperateCol = helper.queryOriginalCollection(selectProperties, this.getQFilters());
             //查询出来为空直接返回
@@ -237,8 +237,8 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin {
     public QFilter[] getQFilters() {
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            QFilter filter = new QFilter("createtime", ">=", sdf.parse(startTime));
-            filter.and("createtime", "<", sdf.parse(endTime));
+            QFilter filter = new QFilter("orgchgentry.operationtime", ">=", sdf.parse(startTime));
+            filter.and("orgchgentry.operationtime", "<", sdf.parse(endTime));
             //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/haos/staff/plugin/task/SyncPersonTask.java

@@ -54,8 +54,9 @@ public class SyncPersonTask extends AbstractTask implements Plugin {
             Map<Long, JSONArray> partTimeMap = getPartTimeInfo(orgDyxMap);
             //构建入参
             buildJSON(ob, dataSet, orgDyxMap, partTimeMap);
-            if(ob.getJSONArray("obj") == null) {
+            if(ob.getJSONArray("obj").size() == 0) {
                 SyncUtil.createLog(SyncUtil.v_success, startTime, endTime, "未查询到变化人员", "未调用", SyncUtil.SyncPerson);
+                return;
             }
             //调用接口
             JSONObject response = SyncUtil.doPostByHttpClient(url, ob);

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/staff/plugin/task/SyncPositionTask.java

@@ -41,7 +41,7 @@ public class SyncPositionTask extends AbstractTask implements Plugin {
             JSONObject ob = new JSONObject();
             initDateRange(map);
             HRBaseServiceHelper helper = new HRBaseServiceHelper(posChgRecord_entity);
-            String selectProperties = "position,evententry.changescene.number,createtime";
+            String selectProperties = "position,evententry.changescene.number,evententry.operatetime";
             //String selectProperties = "aaa";
             //查出发生过变化的岗位
             DynamicObjectCollection changeOperateCol = helper.queryOriginalCollection(selectProperties, this.getQFilters());
@@ -196,8 +196,8 @@ public class SyncPositionTask extends AbstractTask implements Plugin {
     public QFilter[] getQFilters() {
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            QFilter filter = new QFilter("createtime", ">=", sdf.parse(startTime));
-            filter.and("createtime", "<", sdf.parse(endTime));
+            QFilter filter = new QFilter("evententry.operatetime", ">=", sdf.parse(startTime));
+            filter.and("evententry.operatetime", "<", sdf.parse(endTime));
             //filter.and("org.otclassify", "=", 1010L);
             //filter.and("position.number", QCP.equals, "JY-20250407-01772");
             log.info("-------- 查询岗位变化过滤条件：" + filter.toString() + " --------");

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/staff/plugin/task/SyncUtil.java

@@ -29,6 +29,8 @@ public class SyncUtil {
     public static String v_partsuccess = "B";
     public static String v_error = "C";
     public static String SyncOrg = "组织同步";
+    public static String SyncOrg_Person = "组织+人员同步";
+    public static String SyncOrg_Position = "组织+岗位同步";
     public static String SyncPerson = "人员同步";
     public static String SyncPosition = "岗位同步";