From 503d193d5256e3668e0524c2cdf21d7174e1bb5f Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 27 Dec 2024 15:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=20QC3454501=20=E6=B7=B1=E5=9C=B3=E5=85=89?= =?UTF-8?q?=E8=BE=BE=E9=A1=BA=E7=A7=91=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=20=E7=A6=BB=E8=81=8C=E4=BA=BA=E5=91=98=20=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E5=85=A5=E8=81=8C=E5=8F=96=E6=B6=88=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/artifacts/weaver_develop_jar.xml | 2 +- WEB-INF/prop/gdssecond.properties | 4 ++++ src/com/api/hrm/service/HrmResourceBaseService.java | 2 +- .../api/hrm/service/HrmResourcePersonalService.java | 2 +- src/com/api/hrm/util/ServiceUtil.java | 6 ++++++ src/weaver/hrm/pm/action/HrmResourceEntrantAction.java | 5 +++-- .../join/hrm/in/processImpl/HrmImportProcess.java | 10 +++++++--- .../join/hrm/in/processImpl/HrmImportProcessE9.java | 10 +++++++--- 8 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 WEB-INF/prop/gdssecond.properties diff --git a/.idea/artifacts/weaver_develop_jar.xml b/.idea/artifacts/weaver_develop_jar.xml index 6258dfe..2aff103 100644 --- a/.idea/artifacts/weaver_develop_jar.xml +++ b/.idea/artifacts/weaver_develop_jar.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$/out/artifacts/weaver_develop_jar + $PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib diff --git a/WEB-INF/prop/gdssecond.properties b/WEB-INF/prop/gdssecond.properties new file mode 100644 index 0000000..cc501a2 --- /dev/null +++ b/WEB-INF/prop/gdssecond.properties @@ -0,0 +1,4 @@ +#身份证号 +certificatenum=0 +#编号 +workcode=0 \ No newline at end of file diff --git a/src/com/api/hrm/service/HrmResourceBaseService.java b/src/com/api/hrm/service/HrmResourceBaseService.java index 5abcc88..40b6dac 100644 --- a/src/com/api/hrm/service/HrmResourceBaseService.java +++ b/src/com/api/hrm/service/HrmResourceBaseService.java @@ -3367,7 +3367,7 @@ public class HrmResourceBaseService extends BaseBean { } if (!temCode.equals("")) { - tempSql = "select workcode from HrmResource where workcode='" + temCode + "' "; + tempSql = "select workcode from HrmResource where workcode='" + temCode + "' "+(new ServiceUtil().needCheckDismiss("workcode")?"":" and status in(0,1,2,3) "); if (temCode.equals("sysadmin")) { checkMessage = SystemEnv.getHtmlLabelName(510739, user.getLanguage()); //判断workcode编号是不是sysadmin isCheck = true; diff --git a/src/com/api/hrm/service/HrmResourcePersonalService.java b/src/com/api/hrm/service/HrmResourcePersonalService.java index 57473f5..8b75b69 100644 --- a/src/com/api/hrm/service/HrmResourcePersonalService.java +++ b/src/com/api/hrm/service/HrmResourcePersonalService.java @@ -678,7 +678,7 @@ public class HrmResourcePersonalService extends BaseBean { tempCertificatenum = Util.null2String(rs.getString("certificatenum")); } if(!accountType.equals("1")) { - rs.executeSql("select id from HrmResource where id<>"+id+" and certificatenum='"+certificatenum+"' and (accounttype != '1' or accounttype is null)"); + rs.executeSql("select id from HrmResource where id<>"+id+" and certificatenum='"+certificatenum+"' and (accounttype != '1' or accounttype is null)"+(new ServiceUtil().needCheckDismiss("certificatenum")?"":" and status in(0,1,2,3) ")); if(rs.next()){ msg=1; tempcertificatenum = tempCertificatenum; diff --git a/src/com/api/hrm/util/ServiceUtil.java b/src/com/api/hrm/util/ServiceUtil.java index 0b14a6b..84a4f51 100644 --- a/src/com/api/hrm/util/ServiceUtil.java +++ b/src/com/api/hrm/util/ServiceUtil.java @@ -748,4 +748,10 @@ public class ServiceUtil extends BaseBean { } return flag; } + + public boolean needCheckDismiss(String fieldname){ + RecordSet rs = new RecordSet(); + String neekCheck = Util.null2String(rs.getPropValue("Others",fieldname),"1"); + return "1".equals(neekCheck); + } } diff --git a/src/weaver/hrm/pm/action/HrmResourceEntrantAction.java b/src/weaver/hrm/pm/action/HrmResourceEntrantAction.java index 520be18..87604c9 100644 --- a/src/weaver/hrm/pm/action/HrmResourceEntrantAction.java +++ b/src/weaver/hrm/pm/action/HrmResourceEntrantAction.java @@ -9,6 +9,7 @@ import java.util.*; import com.api.hrm.bean.HrmFieldBean; import com.api.hrm.service.HrmResourceWorkService; +import com.api.hrm.util.ServiceUtil; import com.engine.common.service.impl.HrmCommonServiceImpl; import com.engine.hrm.entity.RuleCodeType; import com.engine.hrm.util.CodeRuleManager; @@ -225,10 +226,10 @@ public class HrmResourceEntrantAction extends PmAction { String certificatenum = Util.null2String(baseData.get("certificatenum")).trim(); if(!"".equals(certificatenum)){ - rs.executeQuery("select id from HrmResource where certificatenum = ?", certificatenum); + rs.executeQuery("select id from HrmResource where certificatenum = ? "+(new ServiceUtil().needCheckDismiss("certificatenum")?"":" and status in(0,1,2,3) "), certificatenum); if (rs.next()) { certificatenum = ""; - setReqMessage(SystemEnv.getHtmlLabelName(83521, Util.getIntValue(user.getLanguage()))); + setReqMessage(SystemEnv.getHtmlLabelName(83521,weaver.general.Util.getIntValue(user.getLanguage()))); throw new Exception("身份证重复！"); } } diff --git a/src/weaver/join/hrm/in/processImpl/HrmImportProcess.java b/src/weaver/join/hrm/in/processImpl/HrmImportProcess.java index a3f11b0..4cf54a8 100644 --- a/src/weaver/join/hrm/in/processImpl/HrmImportProcess.java +++ b/src/weaver/join/hrm/in/processImpl/HrmImportProcess.java @@ -2627,14 +2627,16 @@ public class HrmImportProcess extends BaseBean implements IHrmImportProcess { */ public void getKeyMap(String keyField) { RecordSet recordSet = new RecordSet(); + com.api.hrm.util.ServiceUtil serviceUtil = new com.api.hrm.util.ServiceUtil(); String sql = ""; - sql = "select id, certificatenum,isADAccount,loginid,workcode, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; + sql = "select id, certificatenum,isADAccount,loginid,workcode,status, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; if (recordSet.getDBType().equalsIgnoreCase("oracle") || DialectUtil.isMySql() ||recordSet.getDBType().equalsIgnoreCase("postgresql")) { - sql = "select id, certificatenum,isADAccount,loginid,workcode, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; + sql = "select id, certificatenum,isADAccount,loginid,workcode,status, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; } recordSet.execute(sql); String cerNum = ""; while (recordSet.next()) { + int status =recordSet.getInt("status"); for(String key : checkKeys){ Map checkInfo = checkInfos.get(key); if(checkInfo==null){ @@ -2647,8 +2649,10 @@ public class HrmImportProcess extends BaseBean implements IHrmImportProcess { checkInfo.put(val, recordSet.getString("id")); checkInfos.put(key,checkInfo); } - cerNum = recordSet.getString("certificatenum"); keyMap.put(recordSet.getString(keyField), new Integer(recordSet.getInt("id"))); + isADAccountMap.put(Util.null2String(recordSet.getString("id")), Util.null2String(recordSet.getString("isADAccount"))); + if(!serviceUtil.needCheckDismiss("certificatenum") && status>3) continue; + cerNum = recordSet.getString("certificatenum"); if (StringUtil.isNotNull(cerNum)) { certificateNums.put(StringUtil.vString(cerNum), new Integer(recordSet.getInt("id"))); } diff --git a/src/weaver/join/hrm/in/processImpl/HrmImportProcessE9.java b/src/weaver/join/hrm/in/processImpl/HrmImportProcessE9.java index 0bc5adf..c505b1e 100644 --- a/src/weaver/join/hrm/in/processImpl/HrmImportProcessE9.java +++ b/src/weaver/join/hrm/in/processImpl/HrmImportProcessE9.java @@ -2700,14 +2700,16 @@ public class HrmImportProcessE9 extends BaseBean implements IHrmImportProcessE9 */ public void getKeyMap(String keyField) { RecordSet recordSet = new RecordSet(); + com.api.hrm.util.ServiceUtil serviceUtil = new com.api.hrm.util.ServiceUtil(); String sql = ""; - sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; + sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode,status, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; if (recordSet.getDBType().equalsIgnoreCase("sqlserver")) { - sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; + sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode,status, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource"; } recordSet.execute(sql); String cerNum = ""; while (recordSet.next()) { + int status =recordSet.getInt("status"); for(String key : checkKeys){ Map checkInfo = checkInfos.get(key); if(checkInfo==null){ @@ -2716,14 +2718,16 @@ public class HrmImportProcessE9 extends BaseBean implements IHrmImportProcessE9 }else{ checkInfo = checkInfos.get(key); } + if(!"workcode".equals(keyField) && "workcode".equals(key) && !serviceUtil.needCheckDismiss("workcode") && status>3) continue; String val = Util.null2String(recordSet.getString(key)); checkInfo.put(val, recordSet.getString("id")); checkInfos.put(key,checkInfo); } - cerNum = recordSet.getString("certificatenum"); keyMap.put(recordSet.getString(keyField), new Integer(recordSet.getInt("id"))); isADAccountMap.put(Util.null2String(recordSet.getString("id")), Util.null2String(recordSet.getString("isADAccount"))); + if(!serviceUtil.needCheckDismiss("certificatenum") && status>3) continue; + cerNum = recordSet.getString("certificatenum"); String accounttype = recordSet.getString("accounttype"); if(!"1".equalsIgnoreCase(accounttype)){ if (StringUtil.isNotNull(cerNum)) {