Resolved the reported issue by QC

Ajit/Manage SQL Changes APR-26/Java Components/ManageSQLAprv.java

@@ -121,6 +121,12 @@ public class ManageSQLAprv extends ValidatorEJB {
 
 					if ("Y".equalsIgnoreCase(reviewYn) && "S".equalsIgnoreCase(signStatus)) 
 					{
+						Connection updateTxnStatusConn = getConnection();
+						String updateTxnStatusSql = "update sql_changes set txn_status = 'R' where tran_id = ?";
+						PreparedStatement updateTxnStatusPs = conn.prepareStatement(updateTxnStatusSql);
+						updateTxnStatusPs.setString(1, tranID);
+						int updateTxnStatusCount = updateTxnStatusPs.executeUpdate();
+						BaseLogger.log("3", null, null, "ManageSQLAprv in updateTxnStatusCount:: " + updateTxnStatusCount);
 						sendReviewMail(tranID, reviewYn, userInfo, detailDom, conn);
 					}
 				}

Ajit/Manage SQL Changes APR-26/Java Components/ManageSql.java

@@ -358,16 +358,45 @@ public class ManageSql extends ValidatorEJB {
 									}
 									else
 									{
-										String txnStatus = checkNull(getColumnValue("txn_status",dom,"1"));
-										System.out.println("itmDefault txnStatus:: "+txnStatus);
+										String txnStatus = checkNull(getColumnValue("txn_status", dom, "1"));
+
+										if ("R".equalsIgnoreCase(txnStatus)
+												&& "E".equalsIgnoreCase(editFlag.trim())) {
+											 System.out.println("childNodeName in txn_status:: "+childNodeName);
+											// if (!childNodeName.equalsIgnoreCase("review_yn") && !childNodeName.equalsIgnoreCase("txn_status")) {
+											// 	errString = getErrorString("txn_status", "INVLDMER", userId);
+											// 	break;
+											// }
+										}
 
-										if(txnStatus.equalsIgnoreCase("R") && editFlag.trim().equalsIgnoreCase("E"))
-										{
-										   errString = getErrorString("txn_status","MSQLUR",userId);
+										if ("N".equalsIgnoreCase(txnStatus)
+												&& "E".equalsIgnoreCase(editFlag.trim())) {
+											
+											boolean isMSDBA = false;
+
+											UserInfoBean userInfo = getUserInfo();
+											String profileId = checkNull(userInfo.getProfileId());
+											BaseLogger.log("3", null, null, "profileId>>>" + profileId);
+											if (profileId != null) {
+												String[] profileIds = profileId.split(",");
+
+												for (String id : profileIds) {
+													if ("MSDBA".equalsIgnoreCase(id.trim())) {
+														isMSDBA = true;
 														break;
 													}
 												}
 											}
+
+											if (isMSDBA) {
+												System.out.println("Transaction is reviewed cannot edit");
+												errString = getErrorString("txn_status", "MSQLAR", userId);
+												break;
+											}
+
+										}
+									}
+								}
 								//End elseif
 							}//End for loop
 						}//End for loop
@@ -703,8 +732,10 @@ public class ManageSql extends ValidatorEJB {
 
 
 					if (isMSDBA) {
+						String reviewerRemarks = checkNull(genericUtility.getColumnValue("reviewer_remarks", dom));
+						BaseLogger.log("3", getUserInfo(), null, "reviewerRemarks::: "+reviewerRemarks);
 						valueXmlString.append("<reviewer_remarks protect='0'>")
-								.append("<![CDATA[]]>")
+								.append("<![CDATA["+reviewerRemarks+"]]>")
 								.append("</reviewer_remarks>\r\n");
 					}
 

Ajit/Manage SQL Changes APR-26/SQL/SQLs

@@ -490,3 +490,15 @@ update genmst set FLD_MIN = 'SELECT COUNT(1) FROM sql_changes WHERE txn_status i
 ---------23rd July-------
 alter table sql_changes add  (reviewer_remarks varchar2(2000));
 
+Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values 
+('MSQLAR','Transaction is already reviewed.','This transaction has already been reviewed and cannot be edited.','E','Y',null,null,null,to_date('22-OCT-00','DD-MON-RR'),'SUN       ','HDP',null,null);
+
+
+Insert into GENMST (FLD_NAME,MOD_NAME,DESCR,ERROR_CD,BLANK_OPT,FLD_TYPE,FLD_MIN,FLD_MAX,VAL_TYPE,CHG_DATE,CHG_USER,CHG_TERM,VAL_TABLE,SQL_INPUT,FLD_WIDTH,UDF_USAGE_1,UDF_USAGE_2,UDF_USAGE_3,VAL_STAGE,OBJ_NAME,FORM_NO,ACTION,USER_ID,TRAN_ID,UDF_STR1_DESCR,UDF_STR2_DESCR,UDF_STR3_DESCR,EXEC_SEQ) values 
+('EXEC_RIGHTS','W_SQL_CHANGES','Execution Rights','MSQLUR','N','C','SELECT COUNT(1) FROM sql_changes WHERE tran_id = ? AND txn_status = ''R''','0','Q',to_date('09-MAR-26','DD-MON-RR'),'SYSTEM','97PINAKIN1',null,':0.tran_id',0,null,null,null,null,null,'1','confirm',null,'zz000000001100000306',null,null,null,null);
+
+
+Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('MSQLUR','Transaction is Under Review','The transaction cannot be edited or confirm because it is already under review.','E','Y',null,null,null,to_date('22-OCT-00','DD-MON-RR'),'SYSTEM','HDP',null,null);
+
+
+