liang.cheng
/
weaver-develop
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QC3454501 深圳光达顺科技有限公司 离职人员 二次入职取消身份证校验

Browse Source
深圳光达顺科技有限公司
Chengliang 4 months ago
parent 85705c5f60
commit 503d193d52
8 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
.idea/artifacts/weaver_develop_jar.xml
Unescape Escape View File

@ -1,6 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="weaver-develop:jar">
<output-path>$PROJECT_DIR$/out/artifacts/weaver_develop_jar</output-path>
<output-path>$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib</output-path>
<root id="archive" name="weaver-develop.jar">
<element id="module-output" name="weaver-develop" />
</root>

4
WEB-INF/prop/gdssecond.properties
Unescape Escape View File

@ -0,0 +1,4 @@
#身份证号
certificatenum=0
#编号
workcode=0

2
src/com/api/hrm/service/HrmResourceBaseService.java
Unescape Escape View File

@ -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;

2
src/com/api/hrm/service/HrmResourcePersonalService.java
Unescape Escape View File

@ -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;

6
src/com/api/hrm/util/ServiceUtil.java
Unescape Escape View File

@ -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);
}
}

5
src/weaver/hrm/pm/action/HrmResourceEntrantAction.java
Unescape Escape View File

@ -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("身份证重复！");
}
}

10
src/weaver/join/hrm/in/processImpl/HrmImportProcess.java
Unescape Escape View File

@ -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<String,String> 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")));
}

10
src/weaver/join/hrm/in/processImpl/HrmImportProcessE9.java
Unescape Escape View File

@ -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<String,String> 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)) {

Write Preview
Loading…
Cancel
Save