Browse Source

1.R20251021-2237提单,处理入职通用协作问题

Tyx 2 tuần trước cách đây
mục cha
commit
1c3e5a962a

+ 7 - 5
code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hom/explugin/ActivityDomainServiceEx.java

@@ -15,7 +15,8 @@ import java.util.List;
  * 协作活动埋点处理扩展类
  */
 public class ActivityDomainServiceEx implements IActivityDomainService {
-    private static HRBaseServiceHelper ACTIVITY_HELPER = new HRBaseServiceHelper("hrcs_activity");
+    private static HRBaseServiceHelper ACTIVIHANDLE_HELPER = new HRBaseServiceHelper("hom_activehandle");
+
     private static String SSAP_NUMBER = "ssap";
     @Override
     public void triggerTrdActivity(DynamicObject dynamicObject, DynamicObject dynamicObject1, Long aLong) {
@@ -25,14 +26,15 @@ public class ActivityDomainServiceEx implements IActivityDomainService {
     @Override
     public Long triggerTrdActivityNew(DynamicObject activityDy, DynamicObject onbrdbillDyn, Long instanceId) {
         String activityNumber = activityDy.getString(HRBaseConstants.NUMBER);
-        // 如果活动编码为宿舍安排编码ssap,则返回宿舍安排这个活动的主键ID;
+        // 如果活动编码为宿舍安排编码ssap,则返回宿舍安排这个协作任务的主键ID;
         if (SSAP_NUMBER.equals(activityNumber)) {
-            QFilter filter = new QFilter("number", QCP.equals, SSAP_NUMBER);
-            DynamicObject dyn = ACTIVITY_HELPER.queryOne("id", filter);
+            QFilter filter = new QFilter("activity.id", QCP.equals, activityDy.getPkValue());
+            filter.and("onbrdid.id", QCP.equals, onbrdbillDyn.getPkValue());
+            DynamicObject dyn = ACTIVIHANDLE_HELPER.queryOne("entryid", filter);
             return dyn.getLong("id");
         }
         else {
-            return IActivityDomainService.super.triggerTrdActivityNew(activityDy, onbrdbillDyn, instanceId);
+            return null;
         }
     }