refactor(sit): 标品类替换

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/business/importtaskguide/utils/ImportTaskUtils.java

@@ -6,11 +6,10 @@ import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.serialization.SerializationUtils;
 import kd.bos.entity.EntityType;
 import kd.bos.orm.query.QFilter;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
-import kd.swc.hsbp.common.cache.ISWCAppCache;
-import kd.swc.hsbp.common.cache.SWCAppCache;
-import kd.swc.hsbp.common.util.SWCStringUtils;
-import nckd.jxccl.sit.hcsi.common.constant.SitConstant;
+import kd.bos.util.StringUtils;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
+import kd.hr.hbp.common.cache.IHRAppCache;
+import kd.hr.hbp.common.cache.HRAppCache;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
 
 import java.util.*;
@@ -22,7 +21,7 @@ public class ImportTaskUtils {
 
 
     public static DynamicObject getSinsurTplData(Long sinsurTplId, String fields, QFilter qFilter) {
-        SWCDataServiceHelper helper = new SWCDataServiceHelper(SINSURTPL_ENTITY);
+        HRBaseServiceHelper helper = new HRBaseServiceHelper(SINSURTPL_ENTITY);
         QFilter filter = new QFilter("id", "=", sinsurTplId);
         if (qFilter != null) {
             filter.and(qFilter);
@@ -31,7 +30,7 @@ public class ImportTaskUtils {
     }
 
     private static DynamicObjectCollection getSinsurTplDataList(Long sinsurTplId) {
-        SWCDataServiceHelper helper = new SWCDataServiceHelper(SINSURTPL_ENTITY);
+        HRBaseServiceHelper helper = new HRBaseServiceHelper(SINSURTPL_ENTITY);
         String fields = "nckd_sinsurtplentry.nckd_itemtype,nckd_sinsurtplentry.nckd_itemid,nckd_sinsurtplentry.nckd_matchcolumn,nckd_sinsurtplentry.nckd_comment";
         QFilter qFilter = new QFilter("id", "=", sinsurTplId);
         return helper.queryOriginalCollection(fields, new QFilter[]{qFilter}, "nckd_sinsurtplentry.seq asc");
@@ -41,9 +40,9 @@ public class ImportTaskUtils {
         List<Map<String, String>> columnHeadList = new ArrayList(10);
         if (sinsurTplId != null && sinsurTplId != 0L && importTaskId != null && importTaskId != 0L) {
             String cacheKey = importTaskId + "_" + sinsurTplId;
-            ISWCAppCache appCache = SWCAppCache.get(cacheKey);
+            IHRAppCache appCache = HRAppCache.get(cacheKey);
             String json = (String)appCache.get("columnHeadList", String.class);
-            if (SWCStringUtils.isNotEmpty(json)) {
+            if (StringUtils.isNotEmpty(json)) {
                 columnHeadList = (List) SerializationUtils.fromJsonString(json, List.class);
                 return columnHeadList;
             }
@@ -99,7 +98,7 @@ public class ImportTaskUtils {
                 }
                 if (sinsurTplId != null && sinsurTplId != 0L && importTaskId != null && importTaskId != 0L) {
                     String cacheKey = importTaskId + "_" + sinsurTplId;
-                    ISWCAppCache appCache = SWCAppCache.get(cacheKey);
+                    IHRAppCache appCache = HRAppCache.get(cacheKey);
                     appCache.put("columnHeadList", SerializationUtils.toJsonString(columnHeadList));
                 }
                 return columnHeadList;
@@ -152,7 +151,7 @@ public class ImportTaskUtils {
 
     private static void addItemValue(Map<String, String> commentMap, Set<Long> itemSet, String itemKey, Map<String, Map<String, String>> itemMap, String entityId, String itemType) {
         if (itemSet.size() != 0) {
-            SWCDataServiceHelper helper = new SWCDataServiceHelper(entityId);
+            HRBaseServiceHelper helper = new HRBaseServiceHelper(entityId);
             String fields = "id,datatype.id,name";
             DynamicObjectCollection result = helper.queryOriginalCollection(fields, new QFilter[]{new QFilter("id", "in", itemSet)});
             Map<String, String> tempMap = null;
@@ -254,14 +253,14 @@ public class ImportTaskUtils {
     }
 
     public static void updateImportTaskStatus(Long importTaskId) {
-        SWCDataServiceHelper temporaryHelper = new SWCDataServiceHelper("nckd_sinsurtempdata");
+        HRBaseServiceHelper temporaryHelper = new HRBaseServiceHelper("nckd_sinsurtempdata");
         QFilter filter = new QFilter("nckd_importtask", "=", importTaskId);
-        int count = temporaryHelper.count(new QFilter[]{filter});
+        int count = temporaryHelper.count(temporaryHelper.getEntityName(), new QFilter[]{filter});
         if (count == 0) {
             updateImportTaskByDelete(importTaskId, "0", count);
         } else {
             QFilter statusFilter = new QFilter("nckd_datastatus", "=", "5");
-            int writedCount = temporaryHelper.count(new QFilter[]{filter, statusFilter});
+            int writedCount = temporaryHelper.count(temporaryHelper.getEntityName(), new QFilter[]{filter, statusFilter});
             if (count == writedCount) {
                 updateImportTaskByDelete(importTaskId, "2", count);
             } else {
@@ -271,7 +270,7 @@ public class ImportTaskUtils {
     }
 
     private static void updateImportTaskByDelete(Long importTaskId, String taskStatus, int count) {
-        SWCDataServiceHelper taskHelper = new SWCDataServiceHelper("nckd_sinsurimptask");
+        HRBaseServiceHelper taskHelper = new HRBaseServiceHelper("nckd_sinsurimptask");
         DynamicObject task = taskHelper.queryOne(importTaskId);
         if (taskStatus != null) {
             task.set("nckd_taskstatus", taskStatus);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/common/constant/model/SITI18NParam.java

@@ -0,0 +1,59 @@
+package nckd.jxccl.sit.hcsi.common.constant.model;
+
+import kd.bos.dataentity.entity.LocaleString;
+import kd.bos.dataentity.resource.ResManager;
+
+import java.text.MessageFormat;
+
+public class SITI18NParam {
+
+    private String description;
+    private String resourceID;
+    private String systemType;
+
+    public SITI18NParam() {
+    }
+
+    public SITI18NParam(String description, String resourceID, String systemType) {
+        this.description = description;
+        this.resourceID = resourceID;
+        this.systemType = systemType;
+    }
+
+    public LocaleString getLocaleString() {
+        return ResManager.getLocaleString(this.getDescription(), this.getResourceID(), this.getSystemType());
+    }
+
+    public String loadKDString() {
+        return ResManager.loadKDString(this.getDescription(), this.getResourceID(), this.getSystemType(), new Object[0]);
+    }
+
+    public String loadKDString(Object... params) {
+        return MessageFormat.format(ResManager.loadKDString(this.getDescription(), this.getResourceID(), this.getSystemType(), new Object[0]), params);
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getResourceID() {
+        return this.resourceID;
+    }
+
+    public void setResourceID(String resourceID) {
+        this.resourceID = resourceID;
+    }
+
+    public String getSystemType() {
+        return this.systemType;
+    }
+
+    public void setSystemType(String systemType) {
+        this.systemType = systemType;
+    }
+}
+

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/SinsurTempDataListPlugin.java

@@ -1,7 +1,9 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 
+import com.kingdee.util.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.IFormView;
@@ -12,10 +14,8 @@ import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.orm.query.QFilter;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
-import kd.swc.hsbp.common.util.SWCDateTimeUtils;
-import kd.swc.hsbp.common.util.SWCStringUtils;
 
 import java.util.Date;
 import java.util.Map;
@@ -73,20 +73,20 @@ public class SinsurTempDataListPlugin extends AbstractListPlugin implements Plug
 
     private boolean checkTaskStatus(boolean checkIsRunning, boolean checkIsClosed) {
         Long importTaskId = (Long)this.getView().getFormShowParameter().getCustomParam("importTaskId");
-        SWCDataServiceHelper helper = new SWCDataServiceHelper("nckd_sinsurimptask");
+        HRBaseServiceHelper helper = new HRBaseServiceHelper("nckd_sinsurimptask");
         DynamicObject importTask = helper.queryOriginalOne("id,nckd_taskstatus", new QFilter[]{new QFilter("id", "=", importTaskId)});
         String taskStatus = importTask.getString("nckd_taskstatus");
         String msg = null;
         if (checkIsRunning) {
-            if (SWCStringUtils.equals(taskStatus, "4")) {
+            if (StringUtils.equals(taskStatus, "4")) {
                 msg = ResManager.loadKDString("当前任务后台执行校验中，请稍后再试。", "ImportTaskGuideOpereateBillList_13", "swc-hsas-formplugin", new Object[0]);
-            } else if (SWCStringUtils.equals(taskStatus, "3")) {
+            } else if (StringUtils.equals(taskStatus, "3")) {
                 msg = ResManager.loadKDString("当前任务后台执行预处理中，请稍后再试。", "ImportTaskGuideOpereateBillList_14", "swc-hsas-formplugin", new Object[0]);
-            } else if (SWCStringUtils.equals(taskStatus, "6")) {
+            } else if (StringUtils.equals(taskStatus, "6")) {
                 msg = ResManager.loadKDString("当前任务后台执行反写中，请稍后再试。", "ImportTaskGuideOpereateBillList_15", "swc-hsas-formplugin", new Object[0]);
-            } else if (SWCStringUtils.equals(taskStatus, "5")) {
+            } else if (StringUtils.equals(taskStatus, "5")) {
                 msg = ResManager.loadKDString("当前任务后台执行写入中，请稍后再试。", "ImportTaskGuideOpereateBillList_16", "swc-hsas-formplugin", new Object[0]);
-            } else if (SWCStringUtils.equals(taskStatus, "9")) {
+            } else if (StringUtils.equals(taskStatus, "9")) {
                 msg = ResManager.loadKDString("当前任务后台执行清除中间表数据中，请稍后再试。", "ImportTaskGuideOpereateBillList_36", "swc-hsas-formplugin", new Object[0]);
             }
 
@@ -96,7 +96,7 @@ public class SinsurTempDataListPlugin extends AbstractListPlugin implements Plug
             }
         }
 
-        if (!checkIsClosed || !SWCStringUtils.equals(taskStatus, "7") && !SWCStringUtils.equals(taskStatus, "8")) {
+        if (!checkIsClosed || !StringUtils.equals(taskStatus, "7") && !StringUtils.equals(taskStatus, "8")) {
             return false;
         } else {
             msg = ResManager.loadKDString("任务已关闭，无法操作。", "ImportTaskGuideOpereateBillList_35", "swc-hsas-formplugin", new Object[0]);
@@ -143,7 +143,7 @@ public class SinsurTempDataListPlugin extends AbstractListPlugin implements Plug
         formShowParameter.setCustomParam("importTaskId", importTaskId);
         formShowParameter.setCustomParam("totalCount", totalCount);
         formShowParameter.setCustomParam("verifyId", verifyId);
-        formShowParameter.setCustomParam("startTime", SWCDateTimeUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        formShowParameter.setCustomParam("startTime", DateTimeUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
         formShowParameter.setCustomParam("progressType", progressType);
         formShowParameter.setCloseCallBack(new CloseCallBack(this, closeCalBackId));
         this.getView().showForm(formShowParameter);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/SinsurTemplateEdit.java

@@ -3,6 +3,7 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.entity.datamodel.AbstractFormDataModel;
 import kd.bos.entity.datamodel.IDataModel;
 import kd.bos.entity.datamodel.TableValueSetter;
@@ -16,8 +17,6 @@ import kd.bos.form.operate.FormOperate;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.orm.util.CollectionUtils;
 import kd.sdk.plugin.Plugin;
-import kd.swc.hsas.common.enums.PresetItemEnum;
-import kd.swc.hsbp.common.util.SWCStringUtils;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.helper.SinsurTemplateHelper;
 
@@ -309,7 +308,7 @@ public class SinsurTemplateEdit extends AbstractFormPlugin implements Plugin {
             for(index = 0; index < presetDataSize; ++index) {
                 entry = (DynamicObject)entryDatas.get(index);
                 Long itemId = entry.getLong("nckd_itemid");
-                PresetItemEnum presetItemEnum = SinsurTemplateHelper.getPresetItemEnum(itemId);
+                SinsurPresetItemEnum presetItemEnum = SinsurTemplateHelper.getPresetItemEnum(itemId);
                 if (presetItemEnum != null) {
                     model.setValue("nckd_itemnumber", '-', index);
                     model.setValue("nckd_itemnumber", presetItemEnum.getItemName(), index);
@@ -340,7 +339,7 @@ public class SinsurTemplateEdit extends AbstractFormPlugin implements Plugin {
         int index;
         for(index = 0; index < entryDatas.size(); ++index) {
             DynamicObject entry = (DynamicObject)entryDatas.get(index);
-            if (!SWCStringUtils.equals(entry.getString("nckd_itemtype"), "0")) {
+            if (!StringUtils.equals(entry.getString("nckd_itemtype"), "0")) {
                 break;
             }
         }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/SitItemSelectAddItemPlugin.java

@@ -6,6 +6,7 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.dataentity.serialization.SerializationUtils;
+import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.entity.datamodel.AbstractFormDataModel;
 import kd.bos.entity.datamodel.IDataModel;
 import kd.bos.entity.datamodel.TableValueSetter;
@@ -22,11 +23,7 @@ import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.util.CollectionUtils;
-import kd.swc.hsas.business.formula.helper.FormulaDataServiceHelper;
-import kd.swc.hsas.business.formula.helper.FormulaItemOrFuncTreeHelper;
-import kd.swc.hsbp.common.cache.SWCPageCache;
-import kd.swc.hsbp.common.util.SWCObjectUtils;
-import kd.swc.hsbp.common.util.SWCStringUtils;
+import kd.hr.hbp.common.cache.HRPageCache;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.helper.SitItemSelectAddItemServiceHelper;
 
 import java.util.*;
@@ -76,7 +73,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
 
     private boolean isNeedAccItem() {
         IFormView parentView = this.getView().getParentView();
-        return parentView == null || !SWCStringUtils.equals(parentView.getEntityId(), "hsas_migrationtpl");
+        return parentView == null || !StringUtils.equals(parentView.getEntityId(), "hsas_migrationtpl");
     }
 
     @Override
@@ -126,18 +123,40 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
                 .map(selectData -> selectData.getString("nckd_treenodeid"))
                 .collect(Collectors.toSet());
 
-        List<TreeNode> checkNodeList = FormulaItemOrFuncTreeHelper.getCheckTreeNodeList(nodeList, uniqueCodeSet);
+        List<TreeNode> checkNodeList = this.getCheckTreeNodeList(nodeList, uniqueCodeSet);
         if (CollectionUtils.isNotEmpty(checkNodeList)) {
             treeView.checkNodes(checkNodeList);
         }
     }
 
+    public List<TreeNode> getCheckTreeNodeList(List<TreeNode> nodeList, Set<String> uniqueCodeSet) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(uniqueCodeSet)) {
+            return new ArrayList(0);
+        } else {
+            Queue<TreeNode> waitToCheckQueue = new LinkedList();
+            waitToCheckQueue.addAll(nodeList);
+            List<TreeNode> checkNodeList = new ArrayList(10);
+
+            while(waitToCheckQueue.size() > 0) {
+                TreeNode treeNode = (TreeNode)waitToCheckQueue.poll();
+                List<TreeNode> childeList = treeNode.getChildren();
+                if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(childeList)) {
+                    waitToCheckQueue.addAll(childeList);
+                } else if (uniqueCodeSet.contains(treeNode.getId())) {
+                    checkNodeList.add(treeNode);
+                }
+            }
+
+            return checkNodeList;
+        }
+    }
+
     public void loadMainPageData() {
         loadMainPageDataFromMigrationTempate();
     }
 
     private boolean isMigrationTemplate() {
-        return SWCStringUtils.equals(this.getView().getParentView().getEntityId(), "hsas_migrationtpl");
+        return StringUtils.equals(this.getView().getParentView().getEntityId(), "hsas_migrationtpl");
     }
 
     private void loadMainPageDataFromResultList() {
@@ -201,7 +220,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
 
     public void moveToClosedEvent(ClosedCallBackEvent evt) {
         Map<String, Object> returnData = (Map)evt.getReturnData();
-        if (SWCObjectUtils.isEmpty(returnData) || !"ok".equals(returnData.get("clickStatus"))) {
+        if (ObjectUtils.isEmpty(returnData) || !"ok".equals(returnData.get("clickStatus"))) {
             return;
         }
 
@@ -241,7 +260,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
     }
 
     private void updatePageCache(List<TreeNode> nodeList, Map<String, Map<String, Map<String, Object>>> dataMap) {
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Map<String, TreeNode> treeNodeMap = nodeList.stream()
                 .collect(Collectors.toMap(TreeNode::getId, Function.identity()));
 
@@ -275,7 +294,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
             return;
         }
 
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Map<String, TreeNode> nodeMap = getNodeMapFromCache(pageCache);
         Map<String, Map<String, Map<String, Object>>> dataMap = (Map)pageCache.get("allItemData", Map.class);
 
@@ -312,7 +331,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
         }
     }
 
-    private Map<String, TreeNode> getNodeMapFromCache(SWCPageCache pageCache) {
+    private Map<String, TreeNode> getNodeMapFromCache(HRPageCache pageCache) {
         String cacheTreeNodeStr = (String)pageCache.get("tree", String.class);
         return (Map)SerializationUtils.deSerializeFromBase64(cacheTreeNodeStr);
     }
@@ -328,7 +347,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
     }
 
     private boolean isValidNode(TreeNode treeNode, String selectNodeId) {
-        if (treeNode == null || SWCStringUtils.isEmpty(treeNode.getId())) {
+        if (treeNode == null || StringUtils.isEmpty(treeNode.getId())) {
             return false;
         }
 
@@ -354,7 +373,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
 
     private void removeCheckNode(int[] rows) {
         DynamicObjectCollection selectDatas = this.getView().getModel().getEntryEntity(ENTRY_SELECT);
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Map<String, TreeNode> nodeMap = getNodeMapFromCache(pageCache);
 
         List<String> removeCheckNodeList = Arrays.stream(rows)
@@ -381,7 +400,7 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
         Map<String, Object> nameMap = itemMap.get(treeNodeName);
         if (nameMap != null && nameMap.size() != 0) {
             String number = (String)nameMap.get("number");
-            return SWCStringUtils.isEmpty(number) ? "" : number;
+            return StringUtils.isEmpty(number) ? "" : number;
         }
         else {
             return "";
@@ -402,22 +421,22 @@ public class SitItemSelectAddItemPlugin extends AbstractBasePlugIn {
     public boolean isExistTreeNode(String selectTreeNodeId) {
         DynamicObjectCollection itemDatas = this.getModel().getEntryEntity(ENTRY_SELECT);
         return itemDatas.stream()
-                .anyMatch(itemData -> SWCStringUtils.equals(
+                .anyMatch(itemData -> StringUtils.equals(
                         itemData.getString("nckd_treenodeid"),
                         selectTreeNodeId
                 ));
     }
 
     public String getItemUnicodeId(String treeNodeId, String treeNodeName) {
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Map<String, Map<String, String>> dataMap = (Map)pageCache.get("simpleAllItemData", Map.class);
-        if (SWCObjectUtils.isEmpty(dataMap)) {
+        if (ObjectUtils.isEmpty(dataMap)) {
             return "";
         }
 
         return dataMap.values().stream()
                 .map(itemData -> itemData.get(treeNodeName))
-                .filter(uniqueCode -> SWCStringUtils.equals(uniqueCode, treeNodeId))
+                .filter(uniqueCode -> StringUtils.equals(uniqueCode, treeNodeId))
                 .findFirst()
                 .orElse("");
     }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/SitItemSelectItemEntryPlugin.java

@@ -3,18 +3,16 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.form.control.EntryGrid;
 import kd.bos.form.control.Search;
 import kd.bos.form.control.events.SearchEnterEvent;
 import kd.bos.form.control.events.SearchEnterListener;
 import kd.bos.form.plugin.AbstractFormPlugin;
-import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.common.util.SWCObjectUtils;
-import kd.swc.hsbp.common.util.SWCStringUtils;
+import kd.bos.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.EventObject;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -33,12 +31,12 @@ public class SitItemSelectItemEntryPlugin extends AbstractFormPlugin implements
     @Override
     public void search(SearchEnterEvent searchEnterEvent) {
         String searchText = searchEnterEvent.getText();
-        if (SWCStringUtils.isEmpty(searchText)) {
+        if (StringUtils.isEmpty(searchText)) {
             return;
         }
 
         DynamicObjectCollection entryDatas = this.getModel().getEntryEntity("itemselectentry");
-        if (SWCObjectUtils.isEmpty(entryDatas)) {
+        if (ObjectUtils.isEmpty(entryDatas)) {
             return;
         }
 

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/SitItemSelectTreePlugin.java

@@ -2,19 +2,14 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
-import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.entity.tree.TreeNode;
 import kd.bos.form.control.Search;
 import kd.bos.form.control.TreeView;
 import kd.bos.form.control.events.SearchEnterEvent;
 import kd.bos.form.control.events.SearchEnterListener;
 import kd.bos.form.plugin.AbstractFormPlugin;
-import kd.swc.hsas.business.formula.helper.FormulaDataServiceHelper;
-import kd.swc.hsas.business.formula.helper.FormulaItemOrFuncTreeHelper;
-import kd.swc.hsbp.business.servicehelper.SWCSalaryParameterServiceHelper;
-import kd.swc.hsbp.common.cache.SWCPageCache;
-import kd.swc.hsbp.common.constants.WtcInteCfgConstants;
-import kd.swc.hsbp.common.util.SWCStringUtils;
+import kd.bos.util.StringUtils;
+import kd.hr.hbp.common.cache.HRPageCache;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,9 +38,9 @@ public class SitItemSelectTreePlugin extends AbstractFormPlugin implements Searc
     @Override
     public void search(@NotNull SearchEnterEvent event) {
         String searchText = event.getText();
-        boolean isExpend = SWCStringUtils.isNotEmpty(searchText);
+        boolean isExpend = StringUtils.isNotEmpty(searchText);
 
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Map<String, Map<String, Map<String, Object>>> dataMap =
                 (Map)pageCache.get(CACHE_ALL_ITEM_DATA, Map.class);
 
@@ -81,12 +76,34 @@ public class SitItemSelectTreePlugin extends AbstractFormPlugin implements Searc
                 .map(selectData -> selectData.getString("itemunicodeid"))
                 .collect(Collectors.toSet());
 
-        List<TreeNode> checkNodeList = FormulaItemOrFuncTreeHelper.getCheckTreeNodeList(nodeList, uniqueCodeSet);
+        List<TreeNode> checkNodeList = getCheckTreeNodeList(nodeList, uniqueCodeSet);
         if (CollectionUtils.isNotEmpty(checkNodeList)) {
             treeView.checkNodes(checkNodeList);
         }
     }
 
+    public List<TreeNode> getCheckTreeNodeList(List<TreeNode> nodeList, Set<String> uniqueCodeSet) {
+        if (CollectionUtils.isEmpty(uniqueCodeSet)) {
+            return new ArrayList(0);
+        } else {
+            Queue<TreeNode> waitToCheckQueue = new LinkedList();
+            waitToCheckQueue.addAll(nodeList);
+            List<TreeNode> checkNodeList = new ArrayList(10);
+
+            while(waitToCheckQueue.size() > 0) {
+                TreeNode treeNode = (TreeNode)waitToCheckQueue.poll();
+                List<TreeNode> childeList = treeNode.getChildren();
+                if (CollectionUtils.isNotEmpty(childeList)) {
+                    waitToCheckQueue.addAll(childeList);
+                } else if (uniqueCodeSet.contains(treeNode.getId())) {
+                    checkNodeList.add(treeNode);
+                }
+            }
+
+            return checkNodeList;
+        }
+    }
+
     private List<TreeNode> loadSLItemChildNode(String name, boolean isExpend,
                                                Map<String, Map<String, Map<String, Object>>> dataMap) {
         List<Map<String, Object>> salaryItemList = getSalaryItemList(name, dataMap);
@@ -125,11 +142,27 @@ public class SitItemSelectTreePlugin extends AbstractFormPlugin implements Searc
 
     private List<Map<String, Object>> getSalaryItemList(String name,
                                                         Map<String, Map<String, Map<String, Object>>> dataMap) {
-        return SWCStringUtils.isEmpty(name)
-                ? FormulaDataServiceHelper.mapToList(dataMap.get(SALARY_ITEM_KEY))
+        return StringUtils.isEmpty(name)
+                ? mapToList(dataMap.get(SALARY_ITEM_KEY))
                 : findItemByName(name, SALARY_ITEM_KEY, dataMap);
     }
 
+    public static List<Map<String, Object>> mapToList(Map<String, Map<String, Object>> dataMap) {
+        if (dataMap != null && dataMap.size() != 0) {
+            List<Map<String, Object>> result = new ArrayList(dataMap.size());
+            Iterator var2 = dataMap.entrySet().iterator();
+
+            while(var2.hasNext()) {
+                Map.Entry<String, Map<String, Object>> entry = (Map.Entry)var2.next();
+                result.add(entry.getValue());
+            }
+
+            return result;
+        } else {
+            return new ArrayList();
+        }
+    }
+
     private List<TreeNode> buildSalaryItemTree(Map<String, TreeNode> itemTypeNodeMap,
                                                Map<String, List<TreeNode>> salaryItemNodeMap, boolean isExpend) {
         List<TreeNode> treeNodeList = itemTypeNodeMap.entrySet().stream()
@@ -154,68 +187,6 @@ public class SitItemSelectTreePlugin extends AbstractFormPlugin implements Searc
         return Collections.singletonList(itemRoot);
     }
 
-    private static boolean isEnableWtcInte() {
-        Map<String, Object> paramMap = SWCSalaryParameterServiceHelper.getSalaryParam("wtcinte");
-        if (paramMap == null) {
-            return false;
-        }
-
-        Boolean wtcinte = (Boolean)paramMap.get("enableWtcInte");
-        Integer scheme = (Integer)paramMap.getOrDefault("scheme",
-                WtcInteCfgConstants.FIELD_SCHEME_THREE);
-
-        return wtcinte != null && wtcinte &&
-                (WtcInteCfgConstants.FIELD_SCHEME_ONE.equals(scheme) ||
-                        WtcInteCfgConstants.FIELD_SCHEME_TWO.equals(scheme));
-    }
-
-    private static void getTreeNodeList(Map<String, List<TreeNode>> bsNodeMap,
-                                        Map<String, TreeNode> bsTypeNodeMap, String bizTypNumber,
-                                        Map<String, Object> bsItem, String prefixKey) {
-        TreeNode bsNode = new TreeNode(
-                bizTypNumber + PREFIX_SEPARATOR + ITEM_TYPE_BS,
-                String.valueOf(bsItem.get("uniquecode")),
-                (String)bsItem.get("name")
-        );
-
-        bsNodeMap.computeIfAbsent(bizTypNumber, k -> new ArrayList<>(10)).add(bsNode);
-
-        bsTypeNodeMap.computeIfAbsent(bizTypNumber, k ->
-                new TreeNode(prefixKey + ITEM_TYPE_BS,
-                        bizTypNumber + PREFIX_SEPARATOR + ITEM_TYPE_BS,
-                        (String)bsItem.get("bizTypeName")
-                )
-        );
-    }
-
-    private List<TreeNode> loadSPTreeNodeList(String name, boolean isExpend,
-                                              Map<String, Map<String, Map<String, Object>>> dataMap) {
-        List<Map<String, Object>> result = SWCStringUtils.isEmpty(name)
-                ? FormulaDataServiceHelper.mapToList(dataMap.get(SP_ITEM_KEY))
-                : findItemByName(name, SP_ITEM_KEY, dataMap);
-
-        if (CollectionUtils.isEmpty(result)) {
-            return Collections.emptyList();
-        }
-
-        List<TreeNode> treeNodeList = result.stream()
-                .map(spItem -> new TreeNode(
-                        PREFIX_SEPARATOR + ITEM_TYPE_SP,
-                        String.valueOf(spItem.get("uniquecode")),
-                        (String)spItem.get("name")
-                ))
-                .collect(Collectors.toList());
-
-        TreeNode node = new TreeNode("", PREFIX_SEPARATOR + ITEM_TYPE_SP,
-                ResManager.loadKDString("支持项目-SP", "FormulaItemOrFuncTreeHelper_5",
-                        "swc-hsas-business", new Object[0]));
-        node.setChildren(treeNodeList);
-        node.setExpend(isExpend);
-        node.setIsOpened(isExpend);
-
-        return Collections.singletonList(node);
-    }
-
     private List<Map<String, Object>> findItemByName(String name, String itemName,
                                                      Map<String, Map<String, Map<String, Object>>> dataMap) {
         Map<String, Map<String, Object>> result = dataMap.get(itemName);
@@ -231,7 +202,7 @@ public class SitItemSelectTreePlugin extends AbstractFormPlugin implements Searc
                     }
 
                     String number = (String)itemMap.get("number");
-                    return SWCStringUtils.isNotEmpty(number) &&
+                    return StringUtils.isNotEmpty(number) &&
                             (number.contains(name) || entry.getKey().contains(name));
                 })
                 .map(Map.Entry::getValue)

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/basedata/SinsurImpTaskListPlugin.java

@@ -2,6 +2,7 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp.basedata;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.entity.datamodel.ListSelectedRow;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
@@ -9,9 +10,8 @@ import kd.bos.form.events.HyperLinkClickArgs;
 import kd.bos.list.IListView;
 import kd.bos.list.ListShowParameter;
 import kd.bos.list.plugin.AbstractListPlugin;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
-import kd.swc.hsbp.common.util.SWCStringUtils;
 
 import java.text.MessageFormat;
 
@@ -29,7 +29,7 @@ public class SinsurImpTaskListPlugin extends AbstractListPlugin implements Plugi
         ListShowParameter listShowParameter = (ListShowParameter)this.getView().getFormShowParameter();
         if (!listShowParameter.isLookUp()) {
             String fieldName = args.getHyperLinkClickEvent().getFieldName();
-            if (SWCStringUtils.equals("name", fieldName)) {
+            if (StringUtils.equals("name", fieldName)) {
                 args.setCancel(true);
                 IListView listView = (IListView)this.getView();
                 ListSelectedRow selectRow = listView.getCurrentSelectedRowInfo();
@@ -45,13 +45,13 @@ public class SinsurImpTaskListPlugin extends AbstractListPlugin implements Plugi
      * @param importTaskId
      */
     private void openTempDataPage(Long importTaskId) {
-        SWCDataServiceHelper helper = new SWCDataServiceHelper("nckd_sinsurimptask");
+        HRBaseServiceHelper helper = new HRBaseServiceHelper("nckd_sinsurimptask");
         DynamicObject data = helper.queryOne("id,name,nckd_org.id,nckd_welfarepayer.id,nckd_period.id,creator.id,nckd_sinsurtpl.id,nckd_taskstatus", importTaskId);
         String msg;
         if (data == null) {
             msg = ResManager.loadKDString("数据已不存在。", "ImportTaskList_0", "swc-hsas-formplugin", new Object[0]);
             this.getView().showErrorNotification(msg);
-        } else if (SWCStringUtils.equals("8", data.getString("nckd_taskstatus"))) {
+        } else if (StringUtils.equals("8", data.getString("nckd_taskstatus"))) {
             msg = ResManager.loadKDString("所选任务已清除中间表数据，无法查看。", "ImportTaskList_4", "swc-hsas-formplugin", new Object[0]);
             this.getView().showErrorNotification(msg);
         } else {

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/basedata/TaskGuideImportFormPlugin.java

@@ -14,10 +14,6 @@ import kd.bos.form.control.events.UploadEvent;
 import kd.bos.form.control.events.UploadListener;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.url.UrlService;
-import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.business.servicehelper.SWCPermissionServiceHelper;
-import kd.swc.hsbp.common.constants.ImportConstants;
-import kd.swc.hsbp.common.util.SWCStringUtils;
 import nckd.jxccl.sit.hcsi.business.importtaskguide.ImportTaskGuideExportService;
 import nckd.jxccl.sit.hcsi.business.importtaskguide.ImportTaskGuideImportService;
 
@@ -107,7 +103,7 @@ public class TaskGuideImportFormPlugin extends AbstractFormPlugin implements Upl
             try {
                 Map<String, String> result = importService.parseAndCheckExcelData(orgId, pageId, importTaskName);
                 String errorMsg = (String)result.get("errorMsg");
-                if (!SWCStringUtils.isEmpty(errorMsg)) {
+                if (!StringUtils.isEmpty(errorMsg)) {
                     this.getView().showErrorNotification(errorMsg);
                     return;
                 }
@@ -121,7 +117,8 @@ public class TaskGuideImportFormPlugin extends AbstractFormPlugin implements Upl
                 this.getView().returnDataToParent(returnData);
                 this.getView().close();
             } catch (Exception e) {
-                this.getView().showMessage(ImportConstants.IMPORT_TEMPLATE_ERROR(), e.getMessage(), MessageTypes.Default);
+                String msg = ResManager.loadKDString("导入模板格式错误，请上传正确格式的数据模板。", "ImportConstants_3", "swc-hsbp-common", new Object[0]);
+                this.getView().showMessage(msg, e.getMessage(), MessageTypes.Default);
             }
 
         }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/enums/SinsurPresetItemEnum.java

@@ -1,24 +1,23 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.tp.enums;
 
-import kd.swc.hsas.common.enums.PresetItemEnum;
-import kd.swc.hsbp.common.entity.SWCI18NParam;
+import nckd.jxccl.sit.hcsi.common.constant.model.SITI18NParam;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum SinsurPresetItemEnum {
-    EMP_IDCARD("A", 1L, new SWCI18NParam("证件号码", "PresetItemEnum_6", "swc-hsas-common"), 1030L, new SWCI18NParam("必填项，用于确认社保人员", "PresetItemEnum_15", "swc-hsas-common"), new SWCI18NParam("证件号码", "PresetItemEnum_6", "swc-hsas-common"), true),
-    EMP_NAME("B", 2L, new SWCI18NParam("姓名", "PresetItemEnum_6", "swc-hsas-common"), 1030L, new SWCI18NParam("非必填项", "PresetItemEnum_15", "swc-hsas-common"), new SWCI18NParam("姓名", "PresetItemEnum_6", "swc-hsas-common"), false);
+    EMP_IDCARD("A", 1L, new SITI18NParam("证件号码", "PresetItemEnum_6", "swc-hsas-common"), 1030L, new SITI18NParam("必填项，用于确认社保人员", "PresetItemEnum_15", "swc-hsas-common"), new SITI18NParam("证件号码", "PresetItemEnum_6", "swc-hsas-common"), true),
+    EMP_NAME("B", 2L, new SITI18NParam("姓名", "PresetItemEnum_6", "swc-hsas-common"), 1030L, new SITI18NParam("非必填项", "PresetItemEnum_15", "swc-hsas-common"), new SITI18NParam("姓名", "PresetItemEnum_6", "swc-hsas-common"), false);
 
     private String matchColumn;
     private Long itemId;
-    private SWCI18NParam itemName;
+    private SITI18NParam itemName;
     private Long dataTypeId;
-    private SWCI18NParam comment;
-    private SWCI18NParam importColumnName;
+    private SITI18NParam comment;
+    private SITI18NParam importColumnName;
     private boolean isRequire;
 
-    private SinsurPresetItemEnum(String matchColumn, Long itemId, SWCI18NParam itemName, Long dataTypeId, SWCI18NParam comment, SWCI18NParam importColumnName, boolean isRequire) {
+    private SinsurPresetItemEnum(String matchColumn, Long itemId, SITI18NParam itemName, Long dataTypeId, SITI18NParam comment, SITI18NParam importColumnName, boolean isRequire) {
         this.matchColumn = matchColumn;
         this.itemId = itemId;
         this.itemName = itemName;
@@ -40,7 +39,7 @@ public enum SinsurPresetItemEnum {
         return this.itemName.loadKDString();
     }
 
-    public SWCI18NParam getComment() {
+    public SITI18NParam getComment() {
         return this.comment;
     }
 

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/guide/TaskImpGuideListPlugin.java

@@ -10,15 +10,13 @@ import kd.bos.form.control.events.TabSelectEvent;
 import kd.bos.form.control.events.TabSelectListener;
 import kd.bos.form.events.BeforeClosedEvent;
 import kd.bos.form.operate.MutexHelper;
-import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.list.ListShowParameter;
 import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.mutex.DataMutex;
 import kd.bos.orm.query.QFilter;
-import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.common.cache.ISWCAppCache;
-import kd.swc.hsbp.common.cache.SWCAppCache;
-import kd.swc.hsbp.common.cache.SWCPageCache;
+import kd.hr.hbp.common.cache.HRAppCache;
+import kd.hr.hbp.common.cache.HRPageCache;
+import kd.hr.hbp.common.cache.IHRAppCache;
 
 import java.io.IOException;
 import java.util.EventObject;
@@ -47,7 +45,7 @@ public class TaskImpGuideListPlugin extends AbstractListPlugin implements TabSel
         Long importTaskId = (Long)this.getView().getFormShowParameter().getCustomParam("importTaskId");
         StringBuilder msg = new StringBuilder();
         boolean require = MutexHelper.require("nckd_sinsurimptask", importTaskId, "modify", true, msg);
-        SWCPageCache cache = new SWCPageCache(this.getView());
+        HRPageCache cache = new HRPageCache(this.getView());
         if (require) {
             cache.put("currentPageLocked", Boolean.TRUE);
         } else {
@@ -73,7 +71,7 @@ public class TaskImpGuideListPlugin extends AbstractListPlugin implements TabSel
     }
 
     private void loadChildrenPage(String tabKey, String targetKey, String entityName) {
-        SWCPageCache pageCache = new SWCPageCache(this.getView());
+        HRPageCache pageCache = new HRPageCache(this.getView());
         Boolean isLocked = (Boolean)pageCache.get("isLocked", Boolean.class);
         FormShowParameter parameter = this.getView().getFormShowParameter();
         ListShowParameter showParameter = new ListShowParameter();
@@ -125,7 +123,7 @@ public class TaskImpGuideListPlugin extends AbstractListPlugin implements TabSel
                 String lockOwner = (String)mutex.get("GLOBALSESSION");
                 String currentOwner = RequestContext.get().getGlobalSessionId();
                 if (ObjectUtils.nullSafeEquals(lockOwner, currentOwner)) {
-                    SWCPageCache cache = new SWCPageCache(this.getView());
+                    HRPageCache cache = new HRPageCache(this.getView());
                     Boolean isCurrentPageLocked = (Boolean)cache.get("currentPageLocked", Boolean.class);
                     if (isCurrentPageLocked == null) {
                         return;
@@ -156,7 +154,7 @@ public class TaskImpGuideListPlugin extends AbstractListPlugin implements TabSel
     private void clearAppCache() {
         FormShowParameter parameter = this.getView().getFormShowParameter();
         String cacheKey = parameter.getCustomParam("importTaskId") + "_" + parameter.getCustomParam("sinsurTplId");
-        ISWCAppCache appCache = SWCAppCache.get(cacheKey);
+        IHRAppCache appCache = HRAppCache.get(cacheKey);
         appCache.remove("columnHeadList");
     }
 }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/helper/SinsurTemplateHelper.java

@@ -3,28 +3,27 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp.helper;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.orm.query.QFilter;
 import kd.bos.orm.util.CollectionUtils;
-import kd.swc.hsas.common.enums.PresetItemEnum;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
-import kd.swc.hsbp.business.servicehelper.SWCPermissionServiceHelper;
-import kd.swc.hsbp.common.util.SWCStringUtils;
+import kd.bos.servicehelper.basedata.BaseDataServiceHelper;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
 
 import java.util.*;
 
 public class SinsurTemplateHelper {
     private static List<SinsurPresetItemEnum> sinsurPresetItemEnumList = new ArrayList(12);
-    private static Map<Long, PresetItemEnum> commonAndAddPresetItemEnumMap = new HashMap(4);
-    private static Map<Long, PresetItemEnum> hisDataPresetItemEnumMap = new HashMap(12);
-    private static Map<Long, PresetItemEnum> hisDataForMulTimeItemEnumMap = new HashMap(13);
+    private static Map<Long, SinsurPresetItemEnum> commonAndAddPresetItemEnumMap = new HashMap(4);
+    private static Map<Long, SinsurPresetItemEnum> hisDataPresetItemEnumMap = new HashMap(12);
+    private static Map<Long, SinsurPresetItemEnum> hisDataForMulTimeItemEnumMap = new HashMap(13);
 
     public static Map<String, Map<String, Object>> analyzeItemDatas(DynamicObjectCollection itemDatas, Map<Long, Map<String, Object>> existItemDataMap) {
         List<String> IIUnicodeList = new ArrayList(itemDatas.size());
         for (DynamicObject itemData : itemDatas) {
             String itemCategory = itemData.getString("nckd_itemcategory");
             String uniCode = itemData.getString("nckd_itemnumber");
-            if (SWCStringUtils.equals("II", itemCategory)) {
+            if (StringUtils.equals("II", itemCategory)) {
                 IIUnicodeList.add(uniCode);
             }
         }
@@ -66,13 +65,13 @@ public class SinsurTemplateHelper {
                 existItemDataMap = new HashMap(0);
             }
             Map<String, Map<String, Object>> itemParamMap = new HashMap(keyList.size());
-            SWCDataServiceHelper helper = new SWCDataServiceHelper(entityName);
+            HRBaseServiceHelper helper = new HRBaseServiceHelper(entityName);
             String fields = "id,number,name,datatype.id";
 
             QFilter filter = new QFilter(key, "in", keyList);
             filter.and(new QFilter("enable", "=", "1"));
             if (orgId != null) {
-                QFilter useOrgFilter = SWCPermissionServiceHelper.getBaseDataFilter(entityName, orgId);
+                QFilter useOrgFilter = BaseDataServiceHelper.getBaseDataFilter(entityName, orgId);
                 filter.and(useOrgFilter);
             }
             DynamicObjectCollection items = helper.queryOriginalCollection(fields, new QFilter[]{filter});
@@ -102,12 +101,12 @@ public class SinsurTemplateHelper {
         if (existItemData != null && existItemData.size() > 0) {
             itemCurrency = (String)existItemData.get("comment");
             itemParam.put("matchcolumn", existItemData.get("matchcolumn"));
-            if (SWCStringUtils.isNotEmpty(itemCurrency)) {
+            if (StringUtils.isNotEmpty(itemCurrency)) {
                 itemParam.put("comment", itemCurrency);
             }
-        } else if (SWCStringUtils.equals("hsbs_salaryitem", entityName)) {
+        } else if (StringUtils.equals("hsbs_salaryitem", entityName)) {
             itemCurrency = item.getString("outputcurrency.name");
-            if (SWCStringUtils.isNotEmpty(itemCurrency)) {
+            if (StringUtils.isNotEmpty(itemCurrency)) {
                 existComment = ResManager.loadKDString("币种：{0}", "MigrationTemplateHelper_0", "swc-hsas-business", new Object[]{itemCurrency});
                 itemParam.put("comment", existComment);
             }
@@ -128,13 +127,13 @@ public class SinsurTemplateHelper {
                 DynamicObject entry = (DynamicObject)var5.next();
                 String itemType = entry.getString("nckd_itemtype");
                 Long itemId = entry.getLong("nckd_itemid");
-                if (SWCStringUtils.equals("1", itemType)) {
+                if (StringUtils.equals("1", itemType)) {
                     SLItemIdList.add(itemId);
-                } else if (SWCStringUtils.equals("2", itemType)) {
+                } else if (StringUtils.equals("2", itemType)) {
                     SPItemIdList.add(itemId);
-                } else if (SWCStringUtils.equals("3", itemType)) {
+                } else if (StringUtils.equals("3", itemType)) {
                     BSItemIdList.add(itemId);
-                } else if (SWCStringUtils.equals("4", itemType)) {
+                } else if (StringUtils.equals("4", itemType)) {
                     FTItemIdList.add(itemId);
                 }
             }
@@ -148,23 +147,19 @@ public class SinsurTemplateHelper {
         }
     }
 
-    public static PresetItemEnum getPresetItemEnum(Long itemId) {
-        PresetItemEnum presetItemEnum = (PresetItemEnum)commonAndAddPresetItemEnumMap.get(itemId);
+    public static SinsurPresetItemEnum getPresetItemEnum(Long itemId) {
+        SinsurPresetItemEnum presetItemEnum = (SinsurPresetItemEnum)commonAndAddPresetItemEnumMap.get(itemId);
         if (presetItemEnum == null) {
-            presetItemEnum = (PresetItemEnum)hisDataPresetItemEnumMap.get(itemId);
+            presetItemEnum = (SinsurPresetItemEnum)hisDataPresetItemEnumMap.get(itemId);
         }
 
         if (presetItemEnum == null) {
-            presetItemEnum = (PresetItemEnum)hisDataForMulTimeItemEnumMap.get(itemId);
+            presetItemEnum = (SinsurPresetItemEnum)hisDataForMulTimeItemEnumMap.get(itemId);
         }
 
         return presetItemEnum;
     }
 
-    public static List<SinsurPresetItemEnum> getPresetItemEnumList(String writeTaskType) {
-        return getPresetItemEnumList();
-    }
-
     public static List<SinsurPresetItemEnum> getPresetItemEnumList() {
         return sinsurPresetItemEnumList;
     }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/tp/helper/SitItemSelectAddItemServiceHelper.java

@@ -3,14 +3,13 @@ package nckd.jxccl.sit.hcsi.formplugin.web.tp.helper;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
+import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.entity.tree.TreeNode;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.basedata.BaseDataServiceHelper;
 import kd.bos.util.CollectionUtils;
-import kd.swc.hsas.business.formula.helper.FormulaDataServiceHelper;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
-import kd.swc.hsbp.business.servicehelper.SWCPermissionServiceHelper;
-import kd.swc.hsbp.common.util.SWCStringUtils;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -79,12 +78,12 @@ public class SitItemSelectAddItemServiceHelper {
                 .and(new QFilter("status", "=", "C"))
                 .and(new QFilter("insurancetypeattr.number", QCP.not_in, new String[]{"1007_S","1008_S","1013_S","1014_S"}));
         filters.add(baseFilter);
-        filters.add(SWCPermissionServiceHelper.getBaseDataFilter(INSURANCEITEM_ENTITY, orgId));
+        filters.add(BaseDataServiceHelper.getBaseDataFilter(INSURANCEITEM_ENTITY, orgId));
         return filters;
     }
 
     private DynamicObjectCollection queryInsuranceItems(List<QFilter> filters) {
-        SWCDataServiceHelper helper = new SWCDataServiceHelper(INSURANCEITEM_ENTITY);
+        HRBaseServiceHelper helper = new HRBaseServiceHelper(INSURANCEITEM_ENTITY);
         return helper.queryOriginalCollection(
                 QUERY_FIELDS,
                 filters.toArray(new QFilter[0]),
@@ -195,9 +194,40 @@ public class SitItemSelectAddItemServiceHelper {
 
     private static List<Map<String, Object>> getInsuranceItemList(String name,
                                                                Map<String, Map<String, Map<String, Object>>> dataMap) {
-        return SWCStringUtils.isEmpty(name)
-                ? FormulaDataServiceHelper.mapToList(dataMap.get(INSURANCEITEM_KEY))
-                : FormulaDataServiceHelper.findItemByName(name, INSURANCEITEM_KEY, dataMap);
+        return StringUtils.isEmpty(name)
+                ? mapToList(dataMap.get(INSURANCEITEM_KEY))
+                : findItemByName(name, INSURANCEITEM_KEY, dataMap);
+    }
+
+    public static List<Map<String, Object>> mapToList(Map<String, Map<String, Object>> dataMap) {
+        if (dataMap != null && dataMap.size() != 0) {
+            List<Map<String, Object>> result = new ArrayList(dataMap.size());
+            Iterator var2 = dataMap.entrySet().iterator();
+
+            while(var2.hasNext()) {
+                Map.Entry<String, Map<String, Object>> entry = (Map.Entry)var2.next();
+                result.add(entry.getValue());
+            }
+
+            return result;
+        } else {
+            return new ArrayList();
+        }
+    }
+
+    public static List<Map<String, Object>> findItemByName(String name, String itemName, Map<String, Map<String, Map<String, Object>>> dataMap) {
+        List<Map<String, Object>> filterItemsList = new ArrayList();
+        Map<String, Map<String, Object>> result = (Map)dataMap.get(itemName);
+        Iterator var5 = result.entrySet().iterator();
+
+        while(var5.hasNext()) {
+            Map.Entry<String, Map<String, Object>> entry = (Map.Entry)var5.next();
+            if (((String)entry.getKey()).contains(name)) {
+                filterItemsList.add(entry.getValue());
+            }
+        }
+
+        return filterItemsList;
     }
 
     private static List<TreeNode> createRootNode(boolean isExpend) {

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/opplugin/web/tp/SinsurTempDataOpPlugin.java

@@ -8,11 +8,10 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.AfterOperationArgs;
 import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import kd.sdk.plugin.Plugin;
-import kd.swc.hsbp.business.servicehelper.SWCDataServiceHelper;
 import nckd.jxccl.sit.hcsi.business.importtaskguide.utils.ImportTaskUtils;
 
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Set;
@@ -24,7 +23,7 @@ import java.util.stream.Collectors;
  */
 public class SinsurTempDataOpPlugin extends AbstractOperationServicePlugIn implements Plugin {
 
-    private static SWCDataServiceHelper helper = new SWCDataServiceHelper("nckd_sinsurtempdata");
+    private static HRBaseServiceHelper helper = new HRBaseServiceHelper("nckd_sinsurtempdata");
 
     @Override
     public void onPreparePropertys(PreparePropertysEventArgs e) {

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcdm/formplugin/agencybill/AgencyBillEdit.java

@@ -12,6 +12,7 @@ import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.form.operate.FormOperate;
+import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.list.ListFilterParameter;
 import kd.bos.list.ListShowParameter;
 import kd.bos.orm.query.QCP;
@@ -34,7 +35,7 @@ import java.util.stream.Collectors;
  * Tyx 2025-10-29
  * 单位代发单表单插件
  */
-public class AgencyBillEdit extends SWCBaseFormPlugin implements Plugin {
+public class AgencyBillEdit extends AbstractFormPlugin implements Plugin {
 
     private static final String CALLBACK_CLOSE_ADD_ADJFILE = "CALLBACK_CLOSE_ADD_ADJFILE";
     private static final HRBaseServiceHelper SALARYFILE_HELPER = new HRBaseServiceHelper("hsas_salaryfile");
@@ -183,10 +184,6 @@ public class AgencyBillEdit extends SWCBaseFormPlugin implements Plugin {
         formShowParameter.setMultiSelect(true);
         List<QFilter> qFilters = listFilterParameter.getQFilters();
         qFilters.add(new QFilter("iscurrentversion", QCP.equals, "1"));
-        List<QFilter> adjFileInfoPerm = ApplyBillPermCommonHelper.getAdjFileInfoPerm(this.getCheckRightAppId("0VO5EV13=I9W"));
-        if (!CollectionUtils.isEmpty(adjFileInfoPerm)) {
-            qFilters.addAll(adjFileInfoPerm);
-        }
 
         Date effectiveDate = new Date();
         long orgId = this.getModel().getDataEntity().getLong("org.id");

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcdm/formplugin/agencybill/AgencyBillList.java

@@ -12,6 +12,7 @@ import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.list.IListView;
+import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.orm.query.QFilter;
 import kd.swc.hsbp.common.util.SWCStringUtils;
 import kd.swc.hsbp.formplugin.web.SWCDataBaseList;
@@ -27,7 +28,7 @@ import java.util.stream.Collectors;
  * Tyx 2025-11-25
  * 单位代发单列表插件
  */
-public class AgencyBillList extends SWCDataBaseList {
+public class AgencyBillList extends AbstractListPlugin {
 
     @Override
     public void beforeDoOperation(BeforeDoOperationEventArgs args) {

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/cal/CalResultDetailPluginEx.java

@@ -1,18 +1,16 @@
 package nckd.jxccl.swc.hsas.formplugin.web.cal;
 
+import kd.bos.base.AbstractBasePlugIn;
 import kd.bos.entity.datamodel.ListSelectedRowCollection;
-import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
 import kd.bos.form.ShowType;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.list.IListView;
-import kd.swc.hsbp.common.util.SWCStringUtils;
-import kd.swc.hsbp.formplugin.web.SWCDataBaseEdit;
 
 import java.util.*;
 
-public class CalResultDetailPluginEx extends SWCDataBaseEdit {
+public class CalResultDetailPluginEx extends AbstractBasePlugIn {
     public CalResultDetailPluginEx() {
     }
 
@@ -21,7 +19,7 @@ public class CalResultDetailPluginEx extends SWCDataBaseEdit {
         super.beforeDoOperation(args);
         FormOperate formOperate = (FormOperate)args.getSource();
         String opKey = formOperate.getOperateKey();
-        if (SWCStringUtils.equals(opKey, "donothing_openagencypaybill")) {
+        if (opKey.equals("donothing_openagencypaybill")) {
             this.openAgencyPayBill(args);
         }
     }