Merge branch '20231124' of http://221.226.25.34:3000/dxfeng/weaver-hrm-recruit into feature/dxf

 Conflicts:

	src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java

src/com/engine/recruit/conn/CheckRepeatResume.java

@@ -218,12 +218,7 @@ public class CheckRepeatResume {
     private int insertData(Map<String, Object> dataMap) {
         String uuid = UUID.randomUUID().toString();
         dataMap.put("modeuuid", uuid);
-        RecordSet rs = new RecordSet();
-        int formModeId = -1;
-        rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = 'uf_jcl_yppc' )");
-        if (rs.next()) {
-            formModeId = rs.getInt("id");
-        }
+        int formModeId = ApplicantCommonInfo.getModeIdByTableName("uf_jcl_yppc");
         dataMap.put("formmodeid", formModeId);
         RecruitRecordSet.buildModeInsertFields(dataMap, 1);
         RecruitRecordSet.insertData(dataMap, "uf_jcl_yppc");

src/com/engine/recruit/service/impl/ApplicantResumeServiceImpl.java

@@ -483,11 +483,8 @@ public class ApplicantResumeServiceImpl extends Service implements ApplicantResu
         Map<String, Object> dataMap = new RecruitDataMap<>();
         String uuid = UUID.randomUUID().toString();
         dataMap.put("modeuuid", uuid);
-        int formModeId = -1;
-        rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = 'uf_jcl_rck' )");
-        if (rs.next()) {
-            formModeId = rs.getInt("id");
-        }
+        int formModeId = ApplicantCommonInfo.getModeIdByTableName("uf_jcl_rck");
+
         dataMap.put("formmodeid", formModeId);
         // 构建建模表基本数据
         RecruitRecordSet.buildModeInsertFields(dataMap, user.getUID());

src/com/engine/recruit/service/impl/InductionManageServiceImpl.java

@@ -92,11 +92,7 @@ public class InductionManageServiceImpl extends Service implements InductionMana
             Map<String, Object> dataMap = new RecruitDataMap<>();
             String uuid = UUID.randomUUID().toString();
             dataMap.put("modeuuid", uuid);
-            int formModeId = -1;
-            rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = 'uf_jcl_xxcj' )");
-            if (rs.next()) {
-                formModeId = rs.getInt("id");
-            }
+            int formModeId = ApplicantCommonInfo.getModeIdByTableName("uf_jcl_xxcj");
             dataMap.put("formmodeid", formModeId);
             // 构建建模表基本数据
             RecruitRecordSet.buildModeInsertFields(dataMap, creator);

src/com/engine/recruit/service/impl/TalentPoolServiceImpl.java

@@ -56,11 +56,7 @@ public class TalentPoolServiceImpl extends Service implements TalentPoolService
 
         String uuid = UUID.randomUUID().toString();
         insertDataMap.put("modeuuid", uuid);
-        int formModeId = -1;
-        rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = 'uf_jcl_yppc' )");
-        if (rs.next()) {
-            formModeId = rs.getInt("id");
-        }
+        int formModeId = ApplicantCommonInfo.getModeIdByTableName("uf_jcl_yppc");
         insertDataMap.put("formmodeid", formModeId);
         RecruitRecordSet.buildModeInsertFields(insertDataMap, user.getUID());
         RecruitRecordSet.insertData(insertDataMap, "uf_jcl_yppc");

src/weaver/formmode/recruit/modeexpand/applicant/CreatRckApplicantExpand.java

@@ -57,11 +57,7 @@ public class CreatRckApplicantExpand extends AbstractModeExpandJavaCodeNew {
 
                     String uuid = UUID.randomUUID().toString();
                     insertDataMap.put("modeuuid", uuid);
-                    int formModeId = -1;
-                    rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = 'uf_jcl_yppc' )");
-                    if (rs.next()) {
-                        formModeId = rs.getInt("id");
-                    }
+                    int formModeId = ApplicantCommonInfo.getModeIdByTableName("uf_jcl_yppc");
                     insertDataMap.put("formmodeid", formModeId);
                     insertDataMap.put("id", billId);
                     RecruitRecordSet.updateDataById(insertDataMap, "uf_jcl_yppc");

src/weaver/formmode/recruit/modeexpand/departmentscreening/BatchAddDeptScreeningModeExpand.java

@@ -36,12 +36,8 @@ public class BatchAddDeptScreeningModeExpand extends AbstractModeExpandJavaCodeN
         try {
             RequestInfo requestInfo = (RequestInfo) param.get("RequestInfo");
             if (requestInfo != null) {
-                int formModeId = -1;
                 RecordSet rs = new RecordSet();
-                rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = ? )", MODE_TABLE_NAME);
-                if (rs.next()) {
-                    formModeId = rs.getInt("id");
-                }
+                int formModeId = ApplicantCommonInfo.getModeIdByTableName(MODE_TABLE_NAME);
                 MainTableInfo mainTableInfo = requestInfo.getMainTableInfo();
                 Property[] properties = mainTableInfo.getProperty();
                 Map<String, Object> mainDataMap = new HashMap<>();

src/weaver/formmode/recruit/modeexpand/departmentscreening/SingleAddDeptScreeningModeExpand.java

@@ -45,12 +45,8 @@ public class SingleAddDeptScreeningModeExpand extends AbstractModeExpandJavaCode
                     dataMap.put(property.getName(), property.getValue());
                 }
 
-                int formModeId = -1;
                 RecordSet rs = new RecordSet();
-                rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = ? )", MODE_TABLE_NAME);
-                if (rs.next()) {
-                    formModeId = rs.getInt("id");
-                }
+                int formModeId = ApplicantCommonInfo.getModeIdByTableName(MODE_TABLE_NAME);
 
                 User user = (User) param.get("user");
                 // 部门筛选ID

src/weaver/formmode/recruit/modeexpand/interview/BatchAddInterviewResultModeExpand.java

@@ -1,6 +1,7 @@
 package weaver.formmode.recruit.modeexpand.interview;
 
 import com.engine.recruit.constant.RecruitConstant;
+import com.engine.recruit.conn.ApplicantCommonInfo;
 import com.engine.recruit.util.RecruitMessageUtils;
 import com.weaver.formmodel.data.model.Formfield;
 import org.apache.commons.collections.CollectionUtils;
@@ -36,17 +37,8 @@ public class BatchAddInterviewResultModeExpand extends AbstractModeExpandJavaCod
         try {
             RequestInfo requestInfo = (RequestInfo) param.get("RequestInfo");
             if (requestInfo != null) {
-                int formModeId = -1;
-                int formId = -1;
                 RecordSet rs = new RecordSet();
-                rs.executeQuery("select id from workflow_bill where tablename = ?", MODE_TABLE_NAME);
-                if (rs.next()) {
-                    formId = rs.getInt("id");
-                }
-                rs.executeQuery("select id from modeinfo where formid =?", formId);
-                if (rs.next()) {
-                    formModeId = rs.getInt("id");
-                }
+                int formModeId = ApplicantCommonInfo.getModeIdByTableName(MODE_TABLE_NAME);
                 MainTableInfo mainTableInfo = requestInfo.getMainTableInfo();
                 Property[] properties = mainTableInfo.getProperty();
                 Map<String, Object> mainDataMap = new HashMap<>();

src/weaver/formmode/recruit/modeexpand/written/BatchAddWrittenResultModeExpand.java

@@ -1,5 +1,6 @@
 package weaver.formmode.recruit.modeexpand.written;
 
+import com.engine.recruit.conn.ApplicantCommonInfo;
 import com.engine.recruit.conn.RecruitRecordSet;
 import com.engine.recruit.util.RecruitMessageUtils;
 import com.weaver.formmodel.data.model.Formfield;
@@ -33,12 +34,8 @@ public class BatchAddWrittenResultModeExpand extends AbstractModeExpandJavaCodeN
         try {
             RequestInfo requestInfo = (RequestInfo) param.get("RequestInfo");
             if (requestInfo != null) {
-                int formModeId = -1;
                 RecordSet rs = new RecordSet();
-                rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = ? )", MODE_TABLE_NAME);
-                if (rs.next()) {
-                    formModeId = rs.getInt("id");
-                }
+                int formModeId = ApplicantCommonInfo.getModeIdByTableName(MODE_TABLE_NAME);
                 MainTableInfo mainTableInfo = requestInfo.getMainTableInfo();
                 Property[] properties = mainTableInfo.getProperty();
                 Map<String, Object> mainDataMap = new HashMap<>();

src/weaver/interfaces/recruit/action/RecruitFlowToModeAction.java

@@ -3,10 +3,10 @@ package weaver.interfaces.recruit.action;
 import com.cloudstore.dev.api.bean.MessageBean;
 import com.cloudstore.dev.api.bean.MessageType;
 import com.cloudstore.dev.api.util.Util_Message;
+import com.engine.recruit.conn.ApplicantCommonInfo;
 import com.engine.recruit.conn.RecruitRecordSet;
 import org.apache.commons.collections.CollectionUtils;
 import weaver.common.DateUtil;
-import weaver.conn.RecordSet;
 import weaver.conn.RecordSetTrans;
 import weaver.formmode.recruit.modeexpand.util.RecruitModeUtil;
 import weaver.formmode.setup.ModeRightInfo;
@@ -54,12 +54,7 @@ public class RecruitFlowToModeAction implements Action {
         Map<String, Object> mainMap = new HashMap<>(16);
         // 需求审批流程ID
         mainMap.put("xqsplc", requestInfo.getRequestid());
-        int formModeId = -1;
-        RecordSet rs = new RecordSet();
-        rs.executeQuery("select id from modeinfo where formid =( select id from workflow_bill where tablename = ? )", MODE_TABLE_NAME);
-        if (rs.next()) {
-            formModeId = rs.getInt("id");
-        }
+        int formModeId = ApplicantCommonInfo.getModeIdByTableName(MODE_TABLE_NAME);
 
         Property[] propertyArray = mainTableInfo.getProperty();
         for (Property property : propertyArray) {