This commit is contained in:
chi
2022-02-25 02:01:43 +09:00
parent 80d43752c6
commit dfa6ed85ca
6 changed files with 219 additions and 148 deletions

View File

@@ -8276,7 +8276,12 @@ ORDER BY sdate, edate, uid";
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) ORDER BY sdate, edate, uid";
this._commandCollection[1].CommandText = @"SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate,
wuid
FROM Holyday
WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) OR
(gcode = @gcode) AND (edate BETWEEN @sd AND @ed)
ORDER BY sdate, edate, uid";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -8298,12 +8303,13 @@ ORDER BY sdate, edate, uid";
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = @"INSERT INTO Holyday
(cate, sdate, term, title, contents, uid, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
VALUES (@cate,@sdate,@term,@title,@contents,@uid,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);
(cate, sdate, edate, term, title, contents, uid, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
VALUES (@cate,@sdate,@edate,@term,@title,@contents,@uid,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);
SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9328,8 +9334,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)]
public virtual int InsertShort(string cate, string sdate, global::System.Nullable<double> term, string title, string contents, string uid, string wuid, System.DateTime wdate, global::System.Nullable<double> termDr, string gcode, global::System.Nullable<double> DrTime, global::System.Nullable<double> CrTime, string tag) {
public virtual int InsertShort(string cate, string sdate, string edate, global::System.Nullable<double> term, string title, string contents, string uid, string wuid, System.DateTime wdate, global::System.Nullable<double> termDr, string gcode, global::System.Nullable<double> DrTime, global::System.Nullable<double> CrTime, string tag) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
if ((cate == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
@@ -9343,66 +9348,72 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
else {
command.Parameters[1].Value = ((string)(sdate));
}
if ((term.HasValue == true)) {
command.Parameters[2].Value = ((double)(term.Value));
}
else {
if ((edate == null)) {
command.Parameters[2].Value = global::System.DBNull.Value;
}
if ((title == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
else {
command.Parameters[2].Value = ((string)(edate));
}
if ((term.HasValue == true)) {
command.Parameters[3].Value = ((double)(term.Value));
}
else {
command.Parameters[3].Value = ((string)(title));
command.Parameters[3].Value = global::System.DBNull.Value;
}
if ((contents == null)) {
if ((title == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
command.Parameters[4].Value = ((string)(contents));
command.Parameters[4].Value = ((string)(title));
}
if ((uid == null)) {
if ((contents == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
}
else {
command.Parameters[5].Value = ((string)(uid));
command.Parameters[5].Value = ((string)(contents));
}
if ((uid == null)) {
command.Parameters[6].Value = global::System.DBNull.Value;
}
else {
command.Parameters[6].Value = ((string)(uid));
}
if ((wuid == null)) {
throw new global::System.ArgumentNullException("wuid");
}
else {
command.Parameters[6].Value = ((string)(wuid));
command.Parameters[7].Value = ((string)(wuid));
}
command.Parameters[7].Value = ((System.DateTime)(wdate));
command.Parameters[8].Value = ((System.DateTime)(wdate));
if ((termDr.HasValue == true)) {
command.Parameters[8].Value = ((double)(termDr.Value));
command.Parameters[9].Value = ((double)(termDr.Value));
}
else {
command.Parameters[8].Value = global::System.DBNull.Value;
command.Parameters[9].Value = global::System.DBNull.Value;
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
command.Parameters[9].Value = ((string)(gcode));
command.Parameters[10].Value = ((string)(gcode));
}
if ((DrTime.HasValue == true)) {
command.Parameters[10].Value = ((double)(DrTime.Value));
}
else {
command.Parameters[10].Value = global::System.DBNull.Value;
}
if ((CrTime.HasValue == true)) {
command.Parameters[11].Value = ((double)(CrTime.Value));
command.Parameters[11].Value = ((double)(DrTime.Value));
}
else {
command.Parameters[11].Value = global::System.DBNull.Value;
}
if ((tag == null)) {
command.Parameters[12].Value = global::System.DBNull.Value;
if ((CrTime.HasValue == true)) {
command.Parameters[12].Value = ((double)(CrTime.Value));
}
else {
command.Parameters[12].Value = ((string)(tag));
command.Parameters[12].Value = global::System.DBNull.Value;
}
if ((tag == null)) {
command.Parameters[13].Value = global::System.DBNull.Value;
}
else {
command.Parameters[13].Value = ((string)(tag));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)