Merge remote-tracking branch 'origin/master'

code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/utils/DateTimeUtils.java

@@ -0,0 +1,89 @@
+package nckd.jxccl.base.common.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class DateTimeUtils {
+
+    public static String format(Date d, String fmt) {
+        return format(d, fmt, (TimeZone)null);
+    }
+
+    public static String format(Date d, String fmt, TimeZone timezone) {
+        return format(d, fmt, timezone, (Locale)null);
+    }
+
+    public static String format(Date d, String fmt, TimeZone timezone, Locale locale) {
+        if (fmt == null) {
+            fmt = "yyyy-MM-dd HH:mm:ss";
+        }
+
+        SimpleDateFormat df;
+        if (locale == null) {
+            df = new SimpleDateFormat(fmt);
+        } else {
+            df = new SimpleDateFormat(fmt, locale);
+        }
+
+        if (timezone == null) {
+            df.setTimeZone(TimeZone.getDefault());
+        } else {
+            df.setTimeZone(timezone);
+        }
+
+        return df.format(d);
+    }
+
+    public static Date parseDate(String s) throws ParseException {
+        try {
+            return parseDate(s, "yyyy-MM-dd HH:mm:ss");
+        } catch (ParseException var6) {
+            try {
+                return parseDate(s, "yyyy-MM-dd");
+            } catch (ParseException var5) {
+                try {
+                    return parseDate(s, "MM/dd/yyyy HH:mm:ss");
+                } catch (ParseException var4) {
+                    try {
+                        return parseDate(s, "MM/dd/yyyy");
+                    } catch (ParseException var3) {
+                        try {
+                            return parseDate(s, "HH:mm:ss");
+                        } catch (ParseException var2) {
+                            throw new ParseException("can not understand your format", -1);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static Date parseDate(String s, String fmt) throws ParseException {
+        return parseDate(s, fmt, (TimeZone)null);
+    }
+
+    public static Date parseDate(String s, String fmt, TimeZone timezone) throws ParseException {
+        return parseDate(s, fmt, timezone, (Locale)null);
+    }
+
+    public static Date parseDate(String s, String fmt, TimeZone timezone, Locale locale) throws ParseException {
+        SimpleDateFormat df;
+        if (locale == null) {
+            df = new SimpleDateFormat(fmt);
+        } else {
+            df = new SimpleDateFormat(fmt, locale);
+        }
+
+        if (timezone == null) {
+            timezone = TimeZone.getDefault();
+        }
+
+        df.setTimeZone(timezone);
+        df.setLenient(false);
+        return df.parse(s);
+    }
+
+}

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/business/coordination/api/SinsurCoordBizSaveHandler.java

@@ -1,6 +1,5 @@
 package nckd.jxccl.sit.hcsi.business.coordination.api;
 
-import com.kingdee.util.Uuid;
 import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -14,7 +13,6 @@ import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.hr.hbp.business.coordination.api.ext.CoordBizSaveHandler;
 import kd.hr.hbp.business.coordination.model.CoordBizContext;
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
-import nckd.jxccl.sit.hcsi.business.importtaskguide.ImportTaskGuideImportService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -74,7 +72,7 @@ public class SinsurCoordBizSaveHandler implements CoordBizSaveHandler {
                 dyn.set("employee", sinsurFile.getDynamicObject("employee"));
                 dyn.set("welfarepayer", sinsurFile.getDynamicObject("welfarepayer"));
                 dyn.set("nckd_welfarepayertheory", sinsurFile.getDynamicObject("welfarepayertheory"));
-                dyn.set("id", Uuid.create());
+                //dyn.set("id", UUID.randomUUID().toString());
                 Iterator it = fieldMap.keySet().iterator();
                 while (it.hasNext()) {
                     String key = it.next().toString();

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/business/datacomparison/DataComparisonPushService.java

@@ -100,13 +100,16 @@ public class DataComparisonPushService {
             dataMapA.put("description", entry.getString("nckd_remark"));
             dataMapB.put("description", entry.getString("nckd_remark"));
 
-            // 如果value = 0 则跳过这条数据
-            if(valueA.compareTo(BigDecimal.ZERO) > 0) {
-                data.add(dataMapA);
-            }
-            if(valueB.compareTo(BigDecimal.ZERO) > 0) {
-                data.add(dataMapB);
-            }
+            //2026-01-08 Tyx 为0不跳过
+            data.add(dataMapA);
+            data.add(dataMapB);
+//            // 如果value = 0 则跳过这条数据
+//            if(valueA.compareTo(BigDecimal.ZERO) > 0) {
+//                data.add(dataMapA);
+//            }
+//            if(valueB.compareTo(BigDecimal.ZERO) > 0) {
+//                data.add(dataMapB);
+//            }
          }
         map.put("data", data);
         return map;

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

@@ -1,10 +1,10 @@
 package nckd.jxccl.sit.hcsi.business.importtaskguide;
 
 import com.google.common.collect.Lists;
-import com.kingdee.util.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.dataentity.utils.StringUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.exception.ErrorCode;
 import kd.bos.exception.KDException;
 import kd.bos.form.FormShowParameter;

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

@@ -3,7 +3,6 @@ package nckd.jxccl.sit.hcsi.business.importtaskguide;
 import com.google.common.collect.Lists;
 import java.math.BigDecimal;
 
-import com.kingdee.util.DateTimeUtils;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -29,6 +28,7 @@ import kd.hr.hbp.common.cache.HRAppCache;
 import kd.hr.hbp.common.cache.IHRAppCache;
 import nckd.jxccl.sit.hcsi.business.importtaskguide.utils.ImportTaskUtils;
 import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 
 import java.io.InputStream;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/coordination/HCSIEmpCoordVerifBillEditEx.java

@@ -4,6 +4,8 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.entity.datamodel.IDataModel;
+import kd.bos.entity.datamodel.RowDataEntity;
+import kd.bos.entity.datamodel.events.AfterAddRowEventArgs;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.field.BasedataEdit;
 import kd.bos.form.field.events.BeforeF7SelectEvent;
@@ -238,4 +240,23 @@ public class HCSIEmpCoordVerifBillEditEx extends AbstractFormPlugin implements P
     }
 
 
+    /**
+     * 新增分录的时候：
+     * 如果变动大类是非调动的情况则携带表头的理论/实际参保单位
+     * @param e
+     */
+    @Override
+    public void afterAddRow(AfterAddRowEventArgs e) {
+        super.afterAddRow(e);
+        RowDataEntity[] rowDatas = e.getRowDataEntities();
+        IDataModel model = this.getModel();
+        DynamicObject dyn = model.getDataEntity();
+        String chgNumber = dyn.getDynamicObject("coordruleparam").getString("chgevent_z.number");
+        if(!chgNumber.equals("1020_S")) {
+            for (RowDataEntity rowData : rowDatas) {
+                model.setValue("nckd_welfarepayertheory", model.getValue("welfarepayertheory_r31"), rowData.getRowIndex());
+                model.setValue("nckd_welfarepayer", model.getValue("welfarepayer_r31"), rowData.getRowIndex());
+            }
+        }
+    }
 }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/coordination/SinSurEmpChgCoordBatchEditPluginEx.java

@@ -7,6 +7,8 @@ import kd.bos.dataentity.serialization.SerializationUtils;
 import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.entity.EntityMetadataCache;
 import kd.bos.entity.datamodel.IDataModel;
+import kd.bos.entity.datamodel.RowDataEntity;
+import kd.bos.entity.datamodel.events.AfterAddRowEventArgs;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.form.control.EntryGrid;
@@ -460,5 +462,27 @@ public class SinSurEmpChgCoordBatchEditPluginEx extends AbstractFormPlugin imple
         }
     }
 
-
+    /**
+     * 新增分录的时候：
+     * 如果变动大类是非调动的情况则携带表头的理论/实际参保单位
+     * @param e
+     */
+    @Override
+    public void afterAddRow(AfterAddRowEventArgs e) {
+        super.afterAddRow(e);
+        IDataModel model = this.getModel();
+        DynamicObject dyn = model.getDataEntity();
+        String entryName = e.getEntryProp().getName();
+        if(entryName.equals("nckd_subentryentity")) {
+            RowDataEntity[] rowDatas = e.getRowDataEntities();
+            int rowIndex = model.getEntryCurrentRowIndex("entryentity");
+            String chgNumber = ((DynamicObject) model.getValue("coordruleparam", rowIndex)).getString("chgevent_z.number");
+            if(!chgNumber.equals("1020_S")) {
+                for (RowDataEntity rowData : rowDatas) {
+                    model.setValue("nckd_welfarepayertheory", model.getValue("welfarepayertheory_r31"),  rowData.getRowIndex(), rowIndex);
+                    model.setValue("nckd_welfarepayer", model.getValue("welfarepayer_r31"), rowData.getRowIndex(), rowIndex);
+                }
+            }
+        }
+    }
 }

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/datacomparison/DetailCompareBillEdit.java

@@ -16,6 +16,7 @@ import kd.bos.form.operate.FormOperate;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
+import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import nckd.jxccl.sit.hcsi.business.datacomparison.DataComparisonPushService;
 import nckd.jxccl.sit.hcsi.business.datacomparison.DataComparisonQueryService;
 import nckd.jxccl.sit.hcsi.common.constant.SitConstant;
@@ -164,9 +165,18 @@ public class DetailCompareBillEdit extends AbstractFormPlugin {
         Date bsed = model.getDataEntity(true).getDate("nckd_period.startdate");
         EntryGrid entryGrid = this.getControl("nckd_entryentity");
         int[] selectRows = entryGrid.getSelectRows();
+
+        //2026-01-07 Tyx 这里调整成后台保存再调刷新
+        Object pk = model.getDataEntity().getPkValue();
+        HRBaseServiceHelper helper = new HRBaseServiceHelper(model.getDataEntityType().getName());
+        DynamicObject bill = helper.loadOne(pk);
+        DynamicObjectCollection entryCols = bill.getDynamicObjectCollection("nckd_entryentity");
+
+
         List<DynamicObject> list = new ArrayList<>();
         for (int i : selectRows) {
-            list.add(model.getEntryEntity("nckd_entryentity").get(i));
+            //list.add(model.getEntryEntity("nckd_entryentity").get(i));
+            list.add(entryCols.get(i));
         }
         // 业务数据返回参数
         Map response = service.doPush(list, bsed);
@@ -174,7 +184,9 @@ public class DetailCompareBillEdit extends AbstractFormPlugin {
         // 处理返回结果
         List<Map> result = (List<Map>) response.get("result");
         handlePushResult(result, list);
-        this.getView().updateView("nckd_entryentity");
+        helper.saveOne(bill);
+        this.getView().invokeOperation("refresh");
+        //this.getView().updateView("nckd_entryentity");
     }
 
 

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/file/attach/AdjustSIBaseFormPlugin.java

@@ -1,6 +1,5 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.file.attach;
 
-import com.kingdee.util.Uuid;
 import kd.bos.algo.DataSet;
 import kd.bos.algo.Row;
 import kd.bos.dataentity.OperateOption;
@@ -132,7 +131,7 @@ public class AdjustSIBaseFormPlugin extends AbstractFormPlugin implements Plugin
                 bill.set("nckd_sinsurdimension", entry.getDynamicObject("nckd_sinsurdimension"));
                 bill.set("paybaseofemployee", entry.getBigDecimal("nckd_yearamount"));
                 bill.set("paybaseofcompany", entry.getBigDecimal("nckd_yearamount"));
-                bill.set("id", Uuid.create());
+                //bill.set("id", Uuid.create());
                 sibaseCols.add(bill);
             }
             OperationResult result = SaveServiceHelper.saveOperate(SitConstant.SIBASE_HELPER.getEntityName(), sibaseCols.stream().toArray(DynamicObject[]::new), OperateOption.create());

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/formplugin/web/file/attach/FileSIBasePluginEx.java

@@ -1,6 +1,5 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.file.attach;
 
-import com.kingdee.util.StringUtils;
 import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -9,6 +8,7 @@ import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
+import kd.bos.util.StringUtils;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.sit.hcsi.common.constant.SitConstant;
 

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

@@ -1,6 +1,6 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.dataentity.utils.StringUtils;

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

@@ -1,6 +1,6 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.entity.LocaleString;

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

@@ -1,12 +1,12 @@
 package nckd.jxccl.sit.hcsi.formplugin.web.tp;
 
-import com.kingdee.util.StringUtils;
 import kd.bos.base.AbstractBasePlugIn;
 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.dataentity.utils.StringUtils;
 import kd.bos.entity.datamodel.AbstractFormDataModel;
 import kd.bos.entity.datamodel.IDataModel;
 import kd.bos.entity.datamodel.TableValueSetter;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/opplugin/web/coordination/SinsurEmpCoordSplitOp.java

@@ -4,6 +4,7 @@ import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
+import kd.bos.entity.plugin.AddValidatorsEventArgs;
 import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.entity.plugin.args.AfterOperationArgs;
 import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
@@ -14,6 +15,7 @@ import kd.bos.logging.LogFactory;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.sdk.plugin.Plugin;
 import nckd.jxccl.sit.hcsi.business.coordination.SinsurCoordSplitService;
+import nckd.jxccl.sit.hcsi.validate.web.SinsurEmpCoordConfirmEffectValidator;
 
 import java.util.stream.Collectors;
 
@@ -30,6 +32,11 @@ public class SinsurEmpCoordSplitOp extends AbstractOperationServicePlugIn implem
         e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
     }
 
+    public void onAddValidators(AddValidatorsEventArgs e) {
+        super.onAddValidators(e);
+        e.addValidator(new SinsurEmpCoordConfirmEffectValidator());
+    }
+
     @Override
     public void beginOperationTransaction(BeginOperationTransactionArgs e) {
         super.beginOperationTransaction(e);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/sit/hcsi/utils/SITCoordinationUtils.java

@@ -184,6 +184,43 @@ public class SITCoordinationUtils {
     }
 
 
+    /**
+     * 根据员工获取所有参保中的险种基数
+     *
+     * @param employeeId
+     * @return
+     */
+    public static DynamicObject[] getSiBaseByEmployeeId(Long employeeId) {
+        QFilter filter = new QFilter("employee.id", QCP.equals, employeeId);
+        filter.and("insured", QCP.equals, true);
+        filter.and("startdate", QCP.less_equals, new Date());
+        filter.and("enddate", QCP.large_equals, new Date());
+        String selectFields = "startdate,enddate,insured,welfaretype,paybaseofemployee,paybaseofcompany,nckd_sinsurdimension,welfarepayer,nckd_welfarepayertheory,description";
+        DynamicObject[] sibaseCols = SitConstant.SIBASE_HELPER.load(selectFields, filter.toArray());
+        return sibaseCols;
+    }
+
+
+    /**
+     * 字段映射：
+     * 用于调入类型核定单自动携带险种基数信息时
+     * k = 社保基数设置上字段名， v = 核定单分录上字段名
+     * @return
+     */
+    public static Map<String, String> getFieldsMappingMap() {
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("nckd_welfarepayertheory","nckd_welfarepayertheory");
+        map.put("welfarepayer","nckd_welfarepayer");
+        map.put("welfaretype","nckd_welfaretype");
+        map.put("nckd_sinsurdimension","nckd_sinsurdimension");
+        map.put("insured","nckd_insured");
+        map.put("paybaseofemployee","nckd_paybaseofemployee");
+        map.put("paybaseofcompany","nckd_paybaseofcompany");
+        map.put("startdate","nckd_startdate");
+        map.put("enddate","nckd_enddate");
+        map.put("description","nckd_description");
+        return map;
+    }
 
 
 }

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

@@ -1,6 +1,6 @@
 package nckd.jxccl.swc.hcdm.formplugin.agencybill;
 
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/business/outdata/OutImportTaskGuideExportService.java

@@ -1,7 +1,7 @@
 package nckd.jxccl.swc.hsas.business.outdata;
 
 import com.google.common.collect.Lists;
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.resource.ResManager;
@@ -19,7 +19,6 @@ import nckd.jxccl.base.swc.helper.SWCHelper;
 import nckd.jxccl.sit.hcsi.business.importtaskguide.utils.ImportTaskUtils;
 import nckd.jxccl.sit.hcsi.common.constant.enums.DataTypeEnum;
 import nckd.jxccl.sit.hcsi.common.constant.enums.SITShowType;
-import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
 import nckd.jxccl.swc.constants.SwcConstant;
 import nckd.jxccl.swc.hsas.business.utils.OutImportTaskUtils;
 import nckd.jxccl.swc.hsas.common.OutImpPresetItem;
@@ -33,7 +32,6 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Tyx 2025-10-21

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/business/outdata/OutImportTaskGuideImportService.java

@@ -1,7 +1,7 @@
 package nckd.jxccl.swc.hsas.business.outdata;
 
 import com.google.common.collect.Lists;
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -25,7 +25,6 @@ import kd.hr.hbp.business.bgtask.HRBackgroundTaskHelper;
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import kd.hr.hbp.common.cache.HRAppCache;
 import kd.hr.hbp.common.cache.IHRAppCache;
-import nckd.jxccl.sit.hcsi.formplugin.web.tp.enums.SinsurPresetItemEnum;
 import nckd.jxccl.swc.hsas.business.utils.OutImportTaskUtils;
 import nckd.jxccl.swc.hsas.common.OutImpPresetItem;
 import nckd.jxccl.swc.hsas.formplugin.web.outdata.helper.OutImpTemplateHelper;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/outdata/basedata/OutItemSelectAddItemPlugin.java

@@ -1,11 +1,11 @@
 package nckd.jxccl.swc.hsas.formplugin.web.outdata.basedata;
 
-import com.kingdee.util.StringUtils;
 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.dataentity.utils.StringUtils;
 import kd.bos.entity.datamodel.AbstractFormDataModel;
 import kd.bos.entity.datamodel.IDataModel;
 import kd.bos.entity.datamodel.TableValueSetter;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/outdata/bill/OutTempDataListPlugin.java

@@ -1,6 +1,6 @@
 package nckd.jxccl.swc.hsas.formplugin.web.outdata.bill;
 
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.dataentity.utils.StringUtils;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hsas/formplugin/web/outdata/bill/OutTempDataViewBillListPlugin.java

@@ -1,6 +1,6 @@
 package nckd.jxccl.swc.hsas.formplugin.web.outdata.bill;
 
-import com.kingdee.util.DateTimeUtils;
+import nckd.jxccl.base.common.utils.DateTimeUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.entity.LocaleString;

code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/utils/SyncPunchCardHelper.java

@@ -2,7 +2,6 @@ package nckd.jxccl.wtc.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.kingdee.util.StringUtils;
 import kd.bos.dataentity.OperateOption;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.utils.ObjectUtils;
@@ -12,6 +11,7 @@ import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
+import kd.bos.util.StringUtils;
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 import nckd.jxccl.wtc.wtabm.web.common.constant.WtcConstant;