1.考勤模块代码模块目录调整

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/formplugin/web/vaapply/VaApplyBillEditEx.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/vaapply/VaApplyBillEditEx.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.formplugin.web.vaapply;
+package nckd.jxccl.wtc.wtabm.vaapply;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -12,9 +12,8 @@ import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.hr.hbp.formplugin.web.HRCoreBaseBillEdit;
 import kd.wtc.wtbs.common.util.third.util.StringUtils;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util.WtcUtils;
+import nckd.jxccl.wtc.wtabm.web.common.util.WtcUtils;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/formplugin/web/vaapply/VaInfoEditEx.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/vaapply/VaInfoEditEx.java

@@ -1,17 +1,15 @@
-package nckd.jxccl.hr.wtc.wtabm.formplugin.web.vaapply;
+package nckd.jxccl.wtc.wtabm.vaapply;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.utils.ObjectUtils;
-import kd.bos.db.DB;
 import kd.bos.entity.datamodel.IDataModel;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.IFormView;
-import kd.bos.form.field.DateRangeEdit;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.hr.hbp.formplugin.web.HRDataBaseEdit;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util.WtcUtils;
+import nckd.jxccl.wtc.wtabm.web.common.util.WtcUtils;
 
 import java.util.Date;
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/common/constant/WtcConstant.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/common/constant/WtcConstant.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.constant;
+package nckd.jxccl.wtc.wtabm.web.common.constant;
 
 import kd.hr.hbp.business.servicehelper.HRBaseServiceHelper;
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/common/util/WtcUtils.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/common/util/WtcUtils.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util;
+package nckd.jxccl.wtc.wtabm.web.common.util;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/service/VaApplyValidateService.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/service/VaApplyValidateService.java

@@ -1,6 +1,5 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.service;
+package nckd.jxccl.wtc.wtabm.web.service;
 
-import com.kingdee.util.StringUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.logging.Log;
@@ -8,8 +7,8 @@ import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.constant.WtcConstant;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util.WtcUtils;
+import nckd.jxccl.wtc.wtabm.web.common.constant.WtcConstant;
+import nckd.jxccl.wtc.wtabm.web.common.util.WtcUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -18,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class VaApplyValidateService {
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/vaapply/VaApplyAuditOpPluginEx.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/vaapply/VaApplyAuditOpPluginEx.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.vaapply;
+package nckd.jxccl.wtc.wtabm.web.vaapply;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -8,7 +8,7 @@ import kd.bos.entity.plugin.args.AfterOperationArgs;
 import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.constant.WtcConstant;
+import nckd.jxccl.wtc.wtabm.web.common.constant.WtcConstant;
 
 import java.util.Date;
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/vaapply/VaApplySubmitOpPluginEx.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/vaapply/VaApplySubmitOpPluginEx.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.vaapply;
+package nckd.jxccl.wtc.wtabm.web.vaapply;
 
 import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.AddValidatorsEventArgs;
@@ -6,7 +6,7 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.validate.VaApplySubmitValidator;
+import nckd.jxccl.wtc.wtabm.web.validate.VaApplySubmitValidator;
 
 /**
  * Tyx

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtabm/opplugin/web/validate/VaApplySubmitValidator.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtabm/web/validate/VaApplySubmitValidator.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtabm.opplugin.web.validate;
+package nckd.jxccl.wtc.wtabm.web.validate;
 
 import com.kingdee.util.StringUtils;
 import kd.bos.dataentity.entity.DynamicObject;
@@ -6,7 +6,7 @@ import kd.bos.entity.ExtendedDataEntity;
 import kd.bos.entity.validate.AbstractValidator;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.service.VaApplyValidateService;
+import nckd.jxccl.wtc.wtabm.web.service.VaApplyValidateService;
 
 /**
  * Tyx

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtte/report/AbsentDetailReportDataPlugin.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtte/report/AbsentDetailReportDataPlugin.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtte.report;
+package nckd.jxccl.wtc.wtte.report;
 
 import kd.bos.algo.DataSet;
 import kd.bos.dataentity.entity.DynamicObject;
@@ -9,8 +9,8 @@ import kd.bos.entity.report.ReportQueryParam;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.constant.WtcConstant;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util.WtcUtils;
+import nckd.jxccl.wtc.wtabm.web.common.constant.WtcConstant;
+import nckd.jxccl.wtc.wtabm.web.common.util.WtcUtils;
 
 import java.util.Date;
 import java.util.Set;

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtte/report/AttendanceRateReportDataPlugin.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtte/report/AttendanceRateReportDataPlugin.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtte.report;
+package nckd.jxccl.wtc.wtte.report;
 
 import kd.bos.algo.DataSet;
 import kd.bos.dataentity.entity.DynamicObject;
@@ -6,13 +6,11 @@ import kd.bos.dataentity.utils.ObjectUtils;
 import kd.bos.entity.report.AbstractReportListDataPlugin;
 import kd.bos.entity.report.FilterInfo;
 import kd.bos.entity.report.ReportQueryParam;
-import kd.bos.mservice.extreport.dataset.datasource.generic.runtimemodel.JoinType;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
-import kd.hr.haos.business.domain.adminorg.service.impl.AdminOrgQueryServiceHelper;
 import kd.sdk.plugin.Plugin;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.constant.WtcConstant;
-import nckd.jxccl.hr.wtc.wtabm.opplugin.web.common.util.WtcUtils;
+import nckd.jxccl.wtc.wtabm.web.common.constant.WtcConstant;
+import nckd.jxccl.wtc.wtabm.web.common.util.WtcUtils;
 
 import java.util.*;
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/wtc/wtte/formplugin/web/report/AttendanceRateReportFormPlugin.java → code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtte/report/AttendanceRateReportFormPlugin.java

@@ -1,4 +1,4 @@
-package nckd.jxccl.hr.wtc.wtte.formplugin.web.report;
+package nckd.jxccl.wtc.wtte.report;
 
 import kd.bos.dataentity.resource.ResManager;
 import kd.bos.entity.datamodel.IDataModel;