diff --git a/src/main/java/aiyh/utils/Util.java b/src/main/java/aiyh/utils/Util.java
index 16c18ea..19081a2 100644
--- a/src/main/java/aiyh/utils/Util.java
+++ b/src/main/java/aiyh/utils/Util.java
@@ -4092,6 +4092,39 @@ public class Util extends weaver.general.Util {
Util.getLogger().error(getErrString(e));
}
}
+
+ /**
+ *
获取下一个人员id
+ * @author xuanran.wang
+ * @dateTime 2023/7/19 11:24
+ * @return 部门id
+ **/
+ public static int getNextDepartmentId(){
+ RecordSet insertRs = new RecordSet();
+ char separator = weaver.general.Util.getSeparator();
+ String para = "" + separator + "" + separator +
+ "" + separator + "" + separator + "3" + separator + "" + separator + "";
+ insertRs.executeProc("HrmDepartment_Insert", para);
+ if(insertRs.next()){
+ return insertRs.getInt(1);
+ }
+ return -1;
+ }
+
+ /**
+ * 获取下一个人员id
+ * @author xuanran.wang
+ * @dateTime 2023/4/12 13:24
+ * @return 人员id
+ **/
+ public static int getNextHrmId(){
+ RecordSet procRs = new RecordSet();
+ procRs.executeProc("HrmResourceMaxId_Get", "");
+ if (procRs.next()) {
+ return procRs.getInt(1);
+ }
+ return -1;
+ }
}
diff --git a/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmresourceDefinition.java b/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmresourceDefinition.java
deleted file mode 100644
index 69a94cc..0000000
--- a/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmresourceDefinition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.api.xuanran.wang.xk_hospital.data_async.definitions;
-
-import aiyh.utils.response_deal.entity.RowDefinition;
-import aiyh.utils.response_deal.intfaces.RowDefinitionCallback;
-
-/**
- *
- *
- * @author xuanran.wang
- * @date 2023/7/18 11:13
- */
-public class HrmresourceDefinition implements RowDefinitionCallback {
- @Override
- public void rowHandle(RowDefinition rowDefinition) {
-
- }
-
- @Override
- public boolean judgmentRepetition(RowDefinition rowDefinition) {
- return false;
- }
-}
diff --git a/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmDepartmentDefinition.java b/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/row/HrmDepartmentRowDefinition.java
similarity index 84%
rename from src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmDepartmentDefinition.java
rename to src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/row/HrmDepartmentRowDefinition.java
index 872ea51..8492899 100644
--- a/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/HrmDepartmentDefinition.java
+++ b/src/main/java/com/api/xuanran/wang/xk_hospital/data_async/definitions/row/HrmDepartmentRowDefinition.java
@@ -1,17 +1,13 @@
package com.api.xuanran.wang.xk_hospital.data_async.definitions;
import aiyh.utils.Util;
-import aiyh.utils.excention.CustomerException;
-import aiyh.utils.response_deal.entity.FieldDefinition;
import aiyh.utils.response_deal.entity.RowDefinition;
import aiyh.utils.response_deal.intfaces.RowDefinitionCallback;
import aiyh.utils.response_deal.mapper.ConfigMapper;
import aiyh.utils.tool.cn.hutool.core.util.StrUtil;
-import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import java.util.HashMap;
-import java.util.List;
/**
*
@@ -25,7 +21,6 @@ public class HrmDepartmentDefinition implements RowDefinitionCallback {
@Override
public void rowHandle(RowDefinition rowDefinition) {
-
}
@Override
@@ -36,14 +31,14 @@ public class HrmDepartmentDefinition implements RowDefinitionCallback {
if(StrUtil.isBlank(dataId)){
RecordSet insertRs = new RecordSet();
char separator = weaver.general.Util.getSeparator();
- //使用存储过程新增分部
String para = "" + separator + "" + separator +
- "" + separator + "" + separator + "1" + separator + "";
+ "" + separator + "" + separator + "3" + separator + "" + separator + "";
insertRs.executeProc("HrmDepartment_Insert", para);
if (insertRs.next()) {
int depId = insertRs.getInt(1);
rowDefinition.setDataId(depId);
rowDefinition.getWhereParam().put("id", depId);
+ rowDefinition.setConditionScript(" id = #{whereItem.id}");
}
}
return true;