Skip to content

C
Component Sharing
Commit a705fcfd authored by ManishKumar C's avatar ManishKumar C
Browse files
Options

Replace UserInvitationDAO.java

parent c76ed7fe
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 48 deletions
Amol/Manish Changes/UserInvitationDAO.java
View file @ a705fcfd
...@@ -121,8 +121,7 @@ public class UserInvitationDAO ...@@ -121,8 +121,7 @@ public class UserInvitationDAO
append(" U.UUID, "). append(" U.UUID, ").
append(" U.ACC_PARM1 , "). append(" U.ACC_PARM1 , ").
append(" U.ENTITY_CODE, "). append(" U.ENTITY_CODE, ").
append(" U.USER_TYPE, " ). append(" U.USER_TYPE " ).
append(" U.EDI_ADDR " ).//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24
append(" FROM USER_INVITE U, "). append(" FROM USER_INVITE U, ").
append(" USER_REGISTRATION R "). append(" USER_REGISTRATION R ").
append(" WHERE R.EMAIL_ID = U.EMAIL_ID "). append(" WHERE R.EMAIL_ID = U.EMAIL_ID ").
...@@ -167,14 +166,31 @@ public class UserInvitationDAO ...@@ -167,14 +166,31 @@ public class UserInvitationDAO
String dept = deptGradeItmSer[0]; String dept = deptGradeItmSer[0];
String grade = deptGradeItmSer[1]; String grade = deptGradeItmSer[1];
String itmSer = deptGradeItmSer[2]; String itmSer = deptGradeItmSer[2];
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
String designCode = deptGradeItmSer[3];
String reportTo = deptGradeItmSer[4];
String stanCodeHq = deptGradeItmSer[5];
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
dept = dept.substring(dept.lastIndexOf(":") + 1); dept = dept.substring(dept.lastIndexOf(":") + 1);
grade = grade.substring(grade.lastIndexOf(":") + 1); grade = grade.substring(grade.lastIndexOf(":") + 1);
itmSer = itmSer.substring(itmSer.lastIndexOf(":") + 1); itmSer = itmSer.substring(itmSer.lastIndexOf(":") + 1);
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
designCode = designCode.substring(designCode.lastIndexOf(":") + 1);
reportTo = reportTo.substring(reportTo.lastIndexOf(":") + 1);
stanCodeHq = stanCodeHq.substring(stanCodeHq.lastIndexOf(":") + 1);
BaseLogger.log("2",null,null,"designCode ::["+designCode+"]"+"reportTo ::["+reportTo+"]"+"stanCodeHq ::["+stanCodeHq+"]");
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
BaseLogger.log("2",null,null,"dept ::["+dept+"]"+"grade ::["+grade+"]"+"itmSer ::["+itmSer+"]"); BaseLogger.log("2",null,null,"dept ::["+dept+"]"+"grade ::["+grade+"]"+"itmSer ::["+itmSer+"]");
inviteUser.setItemSer(itmSer); inviteUser.setItemSer(itmSer);
inviteUser.setGrade(grade); inviteUser.setGrade(grade);
inviteUser.setDeptCode(dept); inviteUser.setDeptCode(dept);
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
inviteUser.setReportTo(reportTo);
inviteUser.setDesignCode(designCode);
inviteUser.setStanCodeHq(stanCodeHq);
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
} }
if(rs.getString("REGST_STAT") == null || rs.getString("REGST_STAT").equalsIgnoreCase("")) if(rs.getString("REGST_STAT") == null || rs.getString("REGST_STAT").equalsIgnoreCase(""))
...@@ -185,27 +201,6 @@ public class UserInvitationDAO ...@@ -185,27 +201,6 @@ public class UserInvitationDAO
{ {
inviteUser.setStatus(rs.getString("REGST_STAT")); inviteUser.setStatus(rs.getString("REGST_STAT"));
} }
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
String ediAddr = rs.getString("EDI_ADDR");
BaseLogger.log("2",null,null,"ediAddr ::["+ediAddr+"]");
if(ediAddr != null && !ediAddr.isEmpty())
{
String [] reportToDesCodeHq = ediAddr.split("\\$");
String designCode = reportToDesCodeHq[0];
String reportTo = reportToDesCodeHq[1];
String stanCodeHq = reportToDesCodeHq[2];
designCode = designCode.substring(designCode.lastIndexOf(":") + 1);
reportTo = reportTo.substring(reportTo.lastIndexOf(":") + 1);
stanCodeHq = stanCodeHq.substring(stanCodeHq.lastIndexOf(":") + 1);
BaseLogger.log("2",null,null,"designCode ::["+designCode+"]"+"reportTo ::["+reportTo+"]"+"stanCodeHq ::["+stanCodeHq+"]");
inviteUser.setReportTo(reportTo);
inviteUser.setDesignCode(designCode);
inviteUser.setStanCodeHq(stanCodeHq);
}
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
invitedUsers.add(inviteUser); invitedUsers.add(inviteUser);
} }
...@@ -305,7 +300,6 @@ public class UserInvitationDAO ...@@ -305,7 +300,6 @@ public class UserInvitationDAO
append(" U.ACC_PARM1 , "). append(" U.ACC_PARM1 , ").
append(" U.ENTITY_CODE, "). append(" U.ENTITY_CODE, ").
append(" U.USER_TYPE "). append(" U.USER_TYPE ").
append(" U.EDI_ADDR " ).//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24
append("FROM USER_INVITE U, "). append("FROM USER_INVITE U, ").
append(" USER_REGISTRATION R "). append(" USER_REGISTRATION R ").
append("WHERE R.EMAIL_ID = U.EMAIL_ID "). append("WHERE R.EMAIL_ID = U.EMAIL_ID ").
...@@ -338,7 +332,6 @@ public class UserInvitationDAO ...@@ -338,7 +332,6 @@ public class UserInvitationDAO
inviteUser.setUserType(rs.getString("USER_TYPE")); inviteUser.setUserType(rs.getString("USER_TYPE"));
inviteUser.setLicType(rs.getString("USER_LICTYPE")); inviteUser.setLicType(rs.getString("USER_LICTYPE"));
entityCode = rs.getString("ACC_PARM1"); entityCode = rs.getString("ACC_PARM1");
ediAddr = rs.getString("EDI_ADDR");//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24
} }
BaseLogger.log("3",null,null,"entityCode ::["+entityCode+"]"); BaseLogger.log("3",null,null,"entityCode ::["+entityCode+"]");
...@@ -349,33 +342,31 @@ public class UserInvitationDAO ...@@ -349,33 +342,31 @@ public class UserInvitationDAO
String dept = deptGradeItmSer[0]; String dept = deptGradeItmSer[0];
String grade = deptGradeItmSer[1]; String grade = deptGradeItmSer[1];
String itmSer = deptGradeItmSer[2]; String itmSer = deptGradeItmSer[2];
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
String designCode = deptGradeItmSer[3];
String reportTo = deptGradeItmSer[4];
String stanCodeHq = deptGradeItmSer[5];
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
dept = dept.substring(dept.lastIndexOf(":") + 1); dept = dept.substring(dept.lastIndexOf(":") + 1);
grade = grade.substring(grade.lastIndexOf(":") + 1); grade = grade.substring(grade.lastIndexOf(":") + 1);
itmSer = itmSer.substring(itmSer.lastIndexOf(":") + 1); itmSer = itmSer.substring(itmSer.lastIndexOf(":") + 1);
BaseLogger.log("3",null,null,"dept ::["+dept+"]"+"grade ::["+grade+"]"+"itmSer ::["+itmSer+"]");
inviteUser.setItemSer(itmSer);
inviteUser.setGrade(grade);
inviteUser.setDeptCode(dept);
}
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START] //Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
BaseLogger.log("2",null,null,"ediAddr ::["+ediAddr+"]");
if(ediAddr != null && !ediAddr.isEmpty())
{
String [] reportToDesCodeHq = ediAddr.split("\\$");
String designCode = reportToDesCodeHq[0];
String reportTo = reportToDesCodeHq[1];
String stanCodeHq = reportToDesCodeHq[2];
designCode = designCode.substring(designCode.lastIndexOf(":") + 1); designCode = designCode.substring(designCode.lastIndexOf(":") + 1);
reportTo = reportTo.substring(reportTo.lastIndexOf(":") + 1); reportTo = reportTo.substring(reportTo.lastIndexOf(":") + 1);
stanCodeHq = stanCodeHq.substring(stanCodeHq.lastIndexOf(":") + 1); stanCodeHq = stanCodeHq.substring(stanCodeHq.lastIndexOf(":") + 1);
BaseLogger.log("3",null,null,"designCode ::["+designCode+"]"+"reportTo ::["+reportTo+"]"+"stanCodeHq ::["+stanCodeHq+"]");
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
BaseLogger.log("3",null,null,"dept ::["+dept+"]"+"grade ::["+grade+"]"+"itmSer ::["+itmSer+"]");
inviteUser.setItemSer(itmSer);
inviteUser.setGrade(grade);
inviteUser.setDeptCode(dept);
BaseLogger.log("2",null,null,"designCode ::["+designCode+"]"+"reportTo ::["+reportTo+"]"+"stanCodeHq ::["+stanCodeHq+"]"); //Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
inviteUser.setReportTo(reportTo); inviteUser.setReportTo(reportTo);
inviteUser.setDesignCode(designCode); inviteUser.setDesignCode(designCode);
inviteUser.setStanCodeHq(stanCodeHq); inviteUser.setStanCodeHq(stanCodeHq);
}
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END] //Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
}
pstmt.close(); pstmt.close();
rs.close(); rs.close();
...@@ -651,12 +642,11 @@ public class UserInvitationDAO ...@@ -651,12 +642,11 @@ public class UserInvitationDAO
//userCode = generateTranId("w_registration", inviteUser.getUserFirstName().toUpperCase(), "", inviteUser.getChgUser()); //userCode = generateTranId("w_registration", inviteUser.getUserFirstName().toUpperCase(), "", inviteUser.getChgUser());
userCode = generateSeq("USER_INVITE_SEQ", "_seq10", autConn); userCode = generateSeq("USER_INVITE_SEQ", "_seq10", autConn);
//Change by Priyanka B on 25/Jan/19 end //Change by Priyanka B on 25/Jan/19 end
String entityCode = "DEPT:"+checkNull(inviteUser.getDeptCode())+"$GRADE:"+checkNull(inviteUser.getGrade())+"$ITMSER:"+ checkNull(inviteUser.getItemSer()); //String entityCode = "DEPT:"+checkNull(inviteUser.getDeptCode())+"$GRADE:"+checkNull(inviteUser.getGrade())+"$ITMSER:"+ checkNull(inviteUser.getItemSer());
BaseLogger.log("3",null,null,"entityCode in addInviteUser::["+entityCode+"]");
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START] //Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[START]
String stanCodeHQ = checkNull(inviteUser.getStanCodeHq()).trim(); String stanCodeHQ = checkNull(inviteUser.getStanCodeHq()).trim();
String ediAddr = "DESIGNCODE:"+checkNull(inviteUser.getDesignCode())+"$REPORTTO:"+checkNull(inviteUser.getReportTo()+"$HQ:"+stanCodeHQ); String entityCode = "DEPT:"+checkNull(inviteUser.getDeptCode())+"$GRADE:"+checkNull(inviteUser.getGrade())+"$ITMSER:"+ checkNull(inviteUser.getItemSer())+"$DESIGNCODE:"+checkNull(inviteUser.getDesignCode())+"$REPORTTO:"+checkNull(inviteUser.getReportTo()+"$HQ:"+stanCodeHQ);
BaseLogger.log("3",null,null,"ediAddr in addInviteUser::["+ediAddr+"]"); BaseLogger.log("3",null,null,"entityCode in addInviteUser::["+entityCode+"]");
//Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END] //Changes added to get values for designation,reportTo,headquarter on 27-MAR-24[END]
// To get registered Invitee User's Information // To get registered Invitee User's Information
String registerUserId = inviteUser.getChgUser(); String registerUserId = inviteUser.getChgUser();
...@@ -681,8 +671,7 @@ public class UserInvitationDAO ...@@ -681,8 +671,7 @@ public class UserInvitationDAO
rs = null; rs = null;
java.sql.Date currentDate = new java.sql.Date(new java.util.Date().getTime()); java.sql.Date currentDate = new java.sql.Date(new java.util.Date().getTime());
String userSql = "INSERT INTO USER_INVITE(CODE,NAME,EMAIL_ID,MOBILE_NO,PROFILE_ID,SITE_CODE__DEF,USR_LEV,UUID, CHG_USER ,TRANS_DB, ENTERPRISE, ACCT_LOCK, ASCERTAIN_ATTENDANCE, PASSWD_FREQ, WRONG_LOGIN_CNT, ENTITY_CODE, USER_TYPE , ACC_PARM1,INVITATION_DATE,EDI_ADDR) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; String userSql = "INSERT INTO USER_INVITE(CODE,NAME,EMAIL_ID,MOBILE_NO,PROFILE_ID,SITE_CODE__DEF,USR_LEV,UUID, CHG_USER ,TRANS_DB, ENTERPRISE, ACCT_LOCK, ASCERTAIN_ATTENDANCE, PASSWD_FREQ, WRONG_LOGIN_CNT, ENTITY_CODE, USER_TYPE , ACC_PARM1,INVITATION_DATE) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
//Changes added to get values for designation,reportTo,headquarter into EDI_ADDR field on 27-MAR-24
pstmt = autConn.prepareStatement(userSql); pstmt = autConn.prepareStatement(userSql);
pstmt.setString(1, userCode); pstmt.setString(1, userCode);
...@@ -704,7 +693,6 @@ public class UserInvitationDAO ...@@ -704,7 +693,6 @@ public class UserInvitationDAO
pstmt.setString(17, inviteUser.getUserType()); pstmt.setString(17, inviteUser.getUserType());
pstmt.setString(18, entityCode);//ACC_PARM1 pstmt.setString(18, entityCode);//ACC_PARM1
pstmt.setDate(19, currentDate);//added by mayuri on 24 aug 2023 pstmt.setDate(19, currentDate);//added by mayuri on 24 aug 2023
pstmt.setString(20, ediAddr);//Changes added to get values for designation,reportTo,headquarter into EDI_ADDR field on 27-MAR-24
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
pstmt.close(); pstmt.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment