feat(hr): 添加调动申请单功能并优化入职合同生成

- 在FormConstant中新增变动操作实体标识常量
- 在TransferApplyBillConstant中添加二级单位内调动和跨二级单位调动的OP标识
- 创建TransferApplyBillListPlugin列表插件处理调动操作
- 在调动申请单表单插件中添加变动操作处理逻辑
- 将入职合同生成中的HSPM相关字段替换为HRPI字段
- 移除入职合同生成中的合同类型枚举类
- 删除WTC模块中废弃的常量类和服务接口实现

code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/constant/FormConstant.java

@@ -81,6 +81,8 @@ public class FormConstant {
     public static final String HDM_TRANSFERBATCH = "hdm_transferbatch";
     /** 事务变动记录-实体标识 */
     public static final String HPFS_CHGRECORD = "hpfs_chgrecord";
+    /** 变动操作-实体标识 */
+    public static final String HPFS_CHGACTION_ENTITY = "hpfs_chgaction";
     /** 组织-实体标识 */
     public static final String BOS_ORG_ENTITY = "bos_org";
     /** HR组织 */

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hdm/common/transfer/TransferApplyBillConstant.java

@@ -19,6 +19,10 @@ public class TransferApplyBillConstant extends FormConstant {
 
     /** 调动生效后解除合同OP标识 */
     public static final String CANCLECONTRACT_AFTEREFFECT_OP = "canclecontract_aftereffect";
+    /** 二级单位内调动OP标识 */
+    public static final String SECONDARY_UNIT_TRANSFER_OP = "secondary_unit_transfer";
+    /** 跨二级单位调动OP标识 */
+    public static final String CROSS_SECONDARY_UNIT_TRANSFER_OP = "cross_secondary_unit_transfer";
 
     /** 调出公司（业务对象） */
     public static final String BCOMPANYBO_KEY = "bcompanybo";

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hdm/plugin/form/transfer/TransferApplyBillFormPlugin.java

@@ -47,6 +47,7 @@ public class TransferApplyBillFormPlugin extends AbstractFormPlugin {
     Log log = LogFactory.getLog(TransferApplyBillFormPlugin.class);
 
     private static final HRBaseServiceHelper transferApplyHelper = HRBaseServiceHelper.create(TransferApplyBillConstant.HDM_TRANSFERAPPLY);
+    private static final HRBaseServiceHelper chgActionHelper = HRBaseServiceHelper.create(TransferApplyBillConstant.HPFS_CHGACTION_ENTITY);
 
     @Override
     public void afterBindData(EventObject e) {
@@ -84,6 +85,20 @@ public class TransferApplyBillFormPlugin extends AbstractFormPlugin {
     public void afterCreateNewData(EventObject e) {
         super.afterCreateNewData(e);
 
+        String operateKey = getView().getFormShowParameter().getCustomParam("OperateKey");
+        if (HRStringUtils.isNotBlank(operateKey)) {
+            switch (operateKey) {
+                case TransferApplyBillConstant.SECONDARY_UNIT_TRANSFER_OP:
+                    // 二级单位内调拨
+                    getModel().setValue(TransferApplyBillConstant.AFFACTION_KEY, chgActionHelper.loadOne(new QFilter[]{new QFilter(TransferApplyBillConstant.NUMBER_KEY, QCP.equals, "1020_JT")}));
+                    break;
+                case TransferApplyBillConstant.CROSS_SECONDARY_UNIT_TRANSFER_OP:
+                    // 跨二级单位调动
+                    getModel().setValue(TransferApplyBillConstant.AFFACTION_KEY, chgActionHelper.loadOne(new QFilter[]{new QFilter(TransferApplyBillConstant.NUMBER_KEY, QCP.equals, "1010_JT")}));
+
+            }
+        }
+
         // 获取当前登录用户
         long currentUserId = UserServiceHelper.getCurrentUserId();
         // 查询最近一笔调动单创建人是该用户的数据

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/hdm/plugin/form/transfer/TransferApplyBillListPlugin.java

@@ -0,0 +1,32 @@
+package nckd.jxccl.hr.hdm.plugin.form.transfer;
+
+import kd.bos.bill.BillShowParameter;
+import kd.bos.form.ShowType;
+import kd.bos.form.events.AfterDoOperationEventArgs;
+import kd.bos.list.plugin.AbstractListPlugin;
+import nckd.jxccl.hr.hdm.common.transfer.TransferApplyBillConstant;
+
+/**
+ *
+ * @entity:
+ * @author: jtd
+ * @date: 2026/1/13 20:05
+ */
+public class TransferApplyBillListPlugin extends AbstractListPlugin {
+
+    @Override
+    public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs) {
+        super.afterDoOperation(afterDoOperationEventArgs);
+
+        String operateKey = afterDoOperationEventArgs.getOperateKey();
+        switch (operateKey) {
+            case TransferApplyBillConstant.SECONDARY_UNIT_TRANSFER_OP:
+            case TransferApplyBillConstant.CROSS_SECONDARY_UNIT_TRANSFER_OP:
+                BillShowParameter billShowParameter = new BillShowParameter();
+                billShowParameter.setFormId(TransferApplyBillConstant.HDM_TRANSFERAPPLY);
+                billShowParameter.getOpenStyle().setShowType(ShowType.Modal);
+                billShowParameter.setCustomParam("OperateKey", operateKey);
+                getView().showForm(billShowParameter);
+        }
+    }
+}

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/business/application/event/GenerateEmploymentContractEventServicePlugin.java

@@ -48,29 +48,6 @@ import java.util.stream.Collectors;
  * @date: 2025/11/23 20:56
  */
 public class GenerateEmploymentContractEventServicePlugin implements IEventServicePlugin {
-
-    private enum ContractTypeCatEnum {
-        CON(1366793061547512832L, "1010_S"),
-        EMP(1366793180992898048L, "1020_S"),
-        OTHER(1366793317483942912L, "1030_S");
-
-        String value;
-        long pkId;
-
-        private ContractTypeCatEnum(long pkId, String value) {
-            this.pkId = pkId;
-            this.value = value;
-        }
-
-        public String getValue() {
-            return this.value;
-        }
-
-        public long getPkId() {
-            return this.pkId;
-        }
-    }
-
     private static final Log LOGGER = LogFactory.getLog(GenerateEmploymentContractEventServicePlugin.class);
     /** 入职变动大类ID */
     private static final Long CHGEVENT_ID = 1010L;
@@ -126,21 +103,22 @@ public class GenerateEmploymentContractEventServicePlugin implements IEventServi
     }
 
     private void generateEmploymentContract(List<Long> assignmentIds) throws KDException {
+        LOGGER.info("GenerateEmploymentContractEventServicePlugin assignmentIds: [{}]", assignmentIds);
         // hrpi_assignment.id
         String assignmentIdKey = String.join(".", GECEventConstant.ASSIGNMENT_ENTITYID, GECEventConstant.ID_KEY);
         // 查询字段
         String queryFields = QueryFieldBuilder.create()
-                .add(GECEventConstant.HSPM_PERCONTACT_PHONE)
-                .add(GECEventConstant.HSPM_TRIALPERIOD_PROBATION)
-                .add(GECEventConstant.HSPM_TRIALPERIOD_PROBATIONUNIT)
-                .add(GECEventConstant.HSPM_TRIALPERIOD_PREENDDATE)
-                .add(GECEventConstant.HSPM_TRIALPERIOD_TRIALSTARTDATE)
+                .add(GECEventConstant.HRPI_PERCONTACT_PHONE)
+                .add(GECEventConstant.HRPI_TRIALPERIOD_PROBATION)
+                .add(GECEventConstant.HRPI_TRIALPERIOD_PROBATIONUNIT)
+                .add(GECEventConstant.HRPI_TRIALPERIOD_PREENDDATE)
+                .add(GECEventConstant.HRPI_TRIALPERIOD_TRIALSTARTDATE)
                 .add(GECEventConstant.HOUSEHOLDREGISTER_ADDRESSTYPE_ID)
                 .add(GECEventConstant.HOUSEHOLDREGISTER_ADDRESSINFO)
                 .add(GECEventConstant.RESIDENTIALADDRESS_ADDRESSTYPE_ID)
                 .add(GECEventConstant.RESIDENTIALADDRESS_ADDRESSINFO)
-                .add(GECEventConstant.HSPM_PERCRE_CREDENTIALSTYPE_ID)
-                .add(GECEventConstant.HSPM_PERCRE_NUMBER)
+                .add(GECEventConstant.HRPI_PERCRE_CREDENTIALSTYPE_ID)
+                .add(GECEventConstant.HRPI_PERCRE_NUMBER)
                 .add(GECEventConstant.CNIDCARD_CREDENTIALSTYPE_ID)
                 .add(GECEventConstant.CNIDCARD_NUMBER)
                 .add(GECEventConstant.HAOS_ADMINORGHRF7_CORPORATEORG_ID)
@@ -235,14 +213,14 @@ public class GenerateEmploymentContractEventServicePlugin implements IEventServi
             // 设置 职位
             contractApplyNewDyo.set(GECEventConstant.CURJOB_KEY, personInfo.getDynamicObject(GECEventConstant.HRPI_EMPPOSORGREL_JOB));
             // 设置 证件类型
-            Long cardTypeId = personInfo.getLong(GECEventConstant.HSPM_PERCRE_CREDENTIALSTYPE_ID);
+            Long cardTypeId = personInfo.getLong(GECEventConstant.HRPI_PERCRE_CREDENTIALSTYPE_ID);
             cardTypeId = HRObjectUtils.isEmpty(cardTypeId) ? personInfo.getLong(GECEventConstant.CNIDCARD_CREDENTIALSTYPE_ID) : cardTypeId;
             if (HRObjectUtils.isEmpty(cardTypeId)) {
                 throw new KDBizException(String.format("没有可使用的证件类型,组织分配ID[%s]", assignmentId));
             }
             contractApplyNewDyo.set(GECEventConstant.CARDTYPE_KEY, EntityHelper.newEntity(GECEventConstant.HBSS_CREDENTIALSTYPE_ENTITY, cardTypeId));
             // 设置 证件号码
-            String cardNumber = personInfo.getString(GECEventConstant.HSPM_PERCRE_NUMBER);
+            String cardNumber = personInfo.getString(GECEventConstant.HRPI_PERCRE_NUMBER);
             cardNumber = HRStringUtils.isBlank(cardNumber) ? personInfo.getString(GECEventConstant.CNIDCARD_NUMBER) : cardNumber;
             if (HRStringUtils.isBlank(cardNumber)) {
                 throw new KDBizException(String.format("没有可使用的证件号码,组织分配ID[%s]", assignmentId));
@@ -253,7 +231,7 @@ public class GenerateEmploymentContractEventServicePlugin implements IEventServi
             // 设置 居住地址
             contractApplyNewDyo.set(GECEventConstant.RESIDENTIALADDRESS_KEY, personInfo.getString(GECEventConstant.RESIDENTIALADDRESS_ADDRESSINFO));
             // 设置 联系方式
-            contractApplyNewDyo.set(GECEventConstant.EMPPHONE_KEY, personInfo.getString(GECEventConstant.HSPM_PERCONTACT_PHONE));
+            contractApplyNewDyo.set(GECEventConstant.EMPPHONE_KEY, personInfo.getString(GECEventConstant.HRPI_PERCONTACT_PHONE));
             // 设置应签单位、实签单位
             DynamicObject signCompanyDyo = signCompanyMap.get(personInfo.getLong(GECEventConstant.HAOS_ADMINORGHRF7_CORPORATEORG_ID));
             if (HRObjectUtils.isEmpty(signCompanyDyo)) {
@@ -280,13 +258,13 @@ public class GenerateEmploymentContractEventServicePlugin implements IEventServi
             Date endDate = HRDateTimeUtils.addDay(HRDateTimeUtils.addYear(startDate, 5), -1);// +5年-1天
             contractApplyNewDyo.set(GECEventConstant.ENDDATE_KEY, endDate);
             // 设置 试用期开始日期
-            contractApplyNewDyo.set(GECEventConstant.PROBATIONSTARTDATE_KEY, personInfo.getDate(GECEventConstant.HSPM_TRIALPERIOD_TRIALSTARTDATE));
+            contractApplyNewDyo.set(GECEventConstant.PROBATIONSTARTDATE_KEY, personInfo.getDate(GECEventConstant.HRPI_TRIALPERIOD_TRIALSTARTDATE));
             // 设置 试用结束日期
-            contractApplyNewDyo.set(GECEventConstant.PROBATIONENDDATE_KEY, personInfo.getDate(GECEventConstant.HSPM_TRIALPERIOD_PREENDDATE));
+            contractApplyNewDyo.set(GECEventConstant.PROBATIONENDDATE_KEY, personInfo.getDate(GECEventConstant.HRPI_TRIALPERIOD_PREENDDATE));
             // 设置 试用期限
-            contractApplyNewDyo.set(GECEventConstant.PROBATIONPERIOD_KEY, personInfo.getInt(GECEventConstant.HSPM_TRIALPERIOD_PROBATION));
+            contractApplyNewDyo.set(GECEventConstant.PROBATIONPERIOD_KEY, personInfo.getInt(GECEventConstant.HRPI_TRIALPERIOD_PROBATION));
             // 设置 试用期单位
-            contractApplyNewDyo.set(GECEventConstant.PROBATIONUNIT_KEY, personInfo.getString(GECEventConstant.HSPM_TRIALPERIOD_PROBATIONUNIT));
+            contractApplyNewDyo.set(GECEventConstant.PROBATIONUNIT_KEY, personInfo.getString(GECEventConstant.HRPI_TRIALPERIOD_PROBATIONUNIT));
             // 设置 签署方式
             contractApplyNewDyo.set(GECEventConstant.SIGNWAY_KEY, "2");// 默认纸质签署
             // 设置 创建人

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/homs/common/application/event/GECEventConstant.java

@@ -151,20 +151,20 @@ public class GECEventConstant extends FormConstant {
     public static final String HRPI_EMPPOSORGREL_WORKPLACE_NUMBER = "workplace.number";
 
     /** 联系方式.ID */
-    public static final String HSPM_PERCONTACT_ID = "hspm_percontact.id";
+    public static final String HRPI_PERCONTACT_ID = "hrpi_percontact.id";
     /** 联系方式.手机号码 */
-    public static final String HSPM_PERCONTACT_PHONE = "hspm_percontact.phone";
+    public static final String HRPI_PERCONTACT_PHONE = "hrpi_percontact.phone";
 
     /** 试用期.ID */
-    public static final String HSPM_TRIALPERIOD_ID = "hspm_trialperiod.id";
+    public static final String HRPI_TRIALPERIOD_ID = "hrpi_trialperiod.id";
     /** 试用期.试用期长度 */
-    public static final String HSPM_TRIALPERIOD_PROBATION = "hspm_trialperiod.probation";
+    public static final String HRPI_TRIALPERIOD_PROBATION = "hrpi_trialperiod.probation";
     /** 试用期.试用期单位 */
-    public static final String HSPM_TRIALPERIOD_PROBATIONUNIT = "hspm_trialperiod.probationunit";
+    public static final String HRPI_TRIALPERIOD_PROBATIONUNIT = "hrpi_trialperiod.probationunit";
     /** 试用期.预计转正日期 */
-    public static final String HSPM_TRIALPERIOD_PREENDDATE = "hspm_trialperiod.preenddate";
+    public static final String HRPI_TRIALPERIOD_PREENDDATE = "hrpi_trialperiod.preenddate";
     /** 试用期.试用开始日期 */
-    public static final String HSPM_TRIALPERIOD_TRIALSTARTDATE = "hspm_trialperiod.trialstartdate";
+    public static final String HRPI_TRIALPERIOD_TRIALSTARTDATE = "hrpi_trialperiod.trialstartdate";
 
     /** 户口所在地.ID */
     public static final String HOUSEHOLDREGISTER_ID = "householdregister.id";
@@ -181,11 +181,11 @@ public class GECEventConstant extends FormConstant {
     public static final String RESIDENTIALADDRESS_ADDRESSINFO = "residentialaddress.addressinfo";
 
     /** 证件信息.ID */
-    public static final String HSPM_PERCRE_ID = "hspm_percre.id";
+    public static final String HRPI_PERCRE_ID = "hrpi_percre.id";
     /** 证件信息.证件类型.ID */
-    public static final String HSPM_PERCRE_CREDENTIALSTYPE_ID = "hspm_percre.credentialstype.id";
+    public static final String HRPI_PERCRE_CREDENTIALSTYPE_ID = "hrpi_percre.credentialstype.id";
     /** 证件信息.证件号码 */
-    public static final String HSPM_PERCRE_NUMBER = "hspm_percre.number";
+    public static final String HRPI_PERCRE_NUMBER = "hrpi_percre.number";
 
     /** 中国居民身份证.ID */
     public static final String CNIDCARD_ID = "cnidcard.id";

code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtp/common/AppflgConstant.java

@@ -1,22 +0,0 @@
-/**
- * This is a kingdee cosmic template project that is automatically generated by the Kingdee cosmic development assistant plugin. 
- * If there are any issues during the use process, you can provide feedback to the kingdee developer community website.
- * Website: https://developer.kingdee.com/developer?productLineId=29
- * Author: liebin.zheng
- * Generate Date: 2025-10-23 16:09:09
- */
-package nckd.jxccl.wtc.wtp.common;
-
-/**
- * wtc云init应用-通用常量类<br>
- * 代码中不能存在硬编码敏感信息，如账号、密码、http外链、ftp外链、邮箱等。<br>
- * 标识或缓存的常量，需以"KEY_"、"FID_"、"ENTRY_"或"SUBENTRY_"作为变量的前缀。<br>
- *
- * @author nckd
- * @date 2025-10-23 16:09:09
- */
-public class AppflgConstant {
-	
-	public static final String KEY_APP_NAME = "wtc-init";
-
-}

code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtp/mservice/WTPCustomerService.java

@@ -1,38 +0,0 @@
-package nckd.jxccl.wtc.wtp.mservice;
-
-import kd.bos.dataentity.entity.DynamicObject;
-import kd.bos.dataentity.serialization.DataEntitySerializerOption;
-import kd.bos.dataentity.serialization.SerializationUtils;
-import kd.hr.hbp.business.servicehelper.HRMServiceHelper;
-import kd.sdk.wtc.wtp.business.attfile.AttFileVersion;
-import kd.sdk.wtc.wtp.business.helper.WTPServiceHelper;
-import nckd.jxccl.base.common.constant.FormConstant;
-import nckd.jxccl.wtc.wtp.mservice.api.IWTPCustomerService;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-/**
- *  工事假勤规则自定义微服务
- * @author: jtd
- * @date: 2026/1/11 18:41
- */
-public class WTPCustomerService implements IWTPCustomerService {
-
-    @Override
-    public String getAttFile(LocalDate localDate, long employeeId) {
-        AttFileVersion attFile = WTPServiceHelper.getAttFile(localDate, employeeId);
-        return attFile == null ? null : SerializationUtils.toJsonString(WTPServiceHelper.getAttFile(localDate, employeeId));
-    }
-
-    @Override
-    public List<DynamicObject> queryQuota(long attFileBoId, List<Long> qtTypeIdList, int rangQueryType, Date startDate, Date endDate) {
-        List<DynamicObject> quotaDyList = HRMServiceHelper.invokeBizService(FormConstant.WTC_CLOUD, FormConstant.WTP_APP, "IQTService", "queryQuota", new Object[]{attFileBoId, qtTypeIdList, rangQueryType, startDate, endDate});
-        DataEntitySerializerOption dataEntitySerializerOption = new DataEntitySerializerOption();
-        //dataEntitySerializerOption.setIncludeComplexProperty(true);// 包含基础资料已有的所有属性
-        //return quotaDyList == null || quotaDyList.isEmpty() ? new String[0] : quotaDyList.stream().map(DataEntitySerializer::serializerToString).toArray(String[]::new);
-        return quotaDyList;
-    }
-
-}

code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtp/mservice/api/IWTPCustomerService.java

@@ -1,36 +0,0 @@
-package nckd.jxccl.wtc.wtp.mservice.api;
-
-import kd.bos.dataentity.entity.DynamicObject;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 工事假勤规则自定义微服务接口
- * @author: jtd
- * @date: 2026/1/11 18:35
- */
-public interface IWTPCustomerService {
-    /**
-     * 获取人员考勤档案
-     * @from: kd.sdk.wtc.wtp.business.helper.WTPServiceHelper.getAttFile
-     * @param localDate
-     * @param employeeId
-     * @return
-     */
-    String getAttFile(LocalDate localDate, long employeeId);
-
-    /**
-     * 查询定额明细
-     * @from: kd.sdk.wtc.wtp.business.helper.WTPServiceHelper.queryQuota
-     * @param attFileBoId
-     * @param qtTypeIdList
-     * @param rangQueryType
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    List<DynamicObject> queryQuota(long attFileBoId, List<Long> qtTypeIdList, int rangQueryType, Date startDate, Date endDate);
-
-}

code/wtc/nckd-jxccl-wtc/src/main/java/nckd/jxccl/wtc/wtp/servicehelper/ServiceFactory.java

@@ -1,35 +0,0 @@
-package nckd.jxccl.wtc.wtp.servicehelper;
-
-import kd.bos.dataentity.TypesContainer;
-import kd.bos.exception.KDBizException;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * 工事假勤规则自定义微服务工厂
- * @author: jtd
- * @date: 2026/1/11 18:28
- */
-public class ServiceFactory {
-
-    private static Map<String, String> serviceMap = new HashMap<>();
-
-    static {
-        serviceMap.put("IWTPCustomerService", "nckd.jxccl.wtc.wtp.mservice.WTPCustomerService");
-    }
-
-    public static <T> T getService(Class<T> clazz) {
-        return (T) getService(clazz.getSimpleName());
-    }
-
-    public static Object getService(String serviceName) {
-        String className = serviceMap.get(serviceName);
-        if (className == null) {
-            throw new KDBizException(String.format(Locale.ROOT, "未找到%s对应的服务实现。", new Object[]{serviceName}));
-        }
-        return TypesContainer.getOrRegisterSingletonInstance(className);
-    }
-
-}