プロジェクト

全般

プロフィール

リビジョン 54

堀内ほぼ8年前に追加

出勤日報・個人承認・議事録 実装版

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
1660 1660
                                                                                new KeyValuePair<int,string>(0,"総務業務不可"),
1661 1661
                                                                                new KeyValuePair<int,string>(1,"総務業務可能")};
1662 1662
        #endregion
1663

  
1664
        #region 承認対象区分
1665
        /// <summary>
1666
        /// 承認対象区分
1667
        /// </summary>
1668
        public enum ApprovalDivision
1669
        {
1670
            /// <summary>
1671
            /// 工事対象承認
1672
            /// </summary>
1673
            ConstrApproval = 1,
1674
            /// <summary>
1675
            /// 担当者対象承認
1676
            /// </summary>
1677
            PerosonApproval,
1678
        }
1679
        #endregion
1663 1680
    }
1664 1681
}
trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
1795 1795
                    wrk.BackColor = CommonDefine.s_clrError;
1796 1796
                }
1797 1797
            }
1798
            else if (objCtrl.GetType().Equals(typeof(NumericUpDown)))
1799
            {
1800
                NumericUpDown wrk = (NumericUpDown)objCtrl;
1801
                if (bPara)
1802
                {
1803
                    wrk.BackColor = CommonDefine.s_clrNormal;
1804
                }
1805
                else
1806
                {
1807
                    wrk.BackColor = CommonDefine.s_clrError;
1808
                }
1809
            }
1798 1810
        }
1799 1811

  
1800 1812
        #endregion
trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 7;
17
        public static int s_SystemVersion = 11;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs
144 144
        /// <summary>
145 145
        /// 申請レコードを更新する(担当者承認)
146 146
        /// </summary>
147
        /// <param name="ConstructionCode"></param>
147
        /// <param name="PersonCode"></param>
148 148
        /// <param name="ApprovalCode"></param>
149 149
        /// <param name="Status"></param>
150 150
        /// <returns></returns>
151
        public static bool SetPrimaryRecStatus(int ConstructionCode, int ApprovalCode, DateTime OrderDate, int Status)
151
        public static bool SetPrimaryRecStatus(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo, int Status)
152 152
        {
153 153
            IOPersonApproval ApprDB = new IOPersonApproval();
154 154
            try
155 155
            {
156
                if (!ApprDB.UpdateFeild(ConstructionCode,
156
                if (!ApprDB.UpdateFeild(PersonCode,
157 157
                                        ApprovalCode,
158 158
                                        OrderDate,
159
                                        (int)IOProcessApproval.ColumnName.ApprovalStatus,
159
                                        (int)IOPersonApproval.ColumnName.ApprovalStatus,
160 160
                                        Status,
161 161
                                        true,
162
                                        OrderNo,
162 163
                                        1)) return false;
163 164

  
164 165
                return true;
......
182 183
        /// <param name="ConstructionCode"></param>
183 184
        /// <param name="ApprovalCode"></param>
184 185
        /// <returns></returns>
185
        public static bool CheckProcessPetition(int ConstructionCode, int ApprovalCode, int ApprovalCount)
186
        public static bool CheckProcessPetition(int ConstructionCode, int ApprovalCode, int OrderNo)
186 187
        {
187 188
            IOProcessApproval ApprDB = new IOProcessApproval();
188 189
            try
189 190
            {
190 191
                bool bPetition = false;
191 192
                // 申請データ取得
192
                string strSQL = ApprDB.CreatePrimarykeyString(ConstructionCode, ApprovalCode, ApprovalCount, 1);
193
                string strSQL = ApprDB.CreatePrimarykeyString(ConstructionCode, ApprovalCode, OrderNo, 1);
193 194
                List<ProcessApproval> PetitionList = new List<ProcessApproval>();
194 195
                if (!ApprDB.SelectAction(strSQL, ref PetitionList)) return bPetition;
195 196
                // 申請データが無い場合
......
216 217
        /// <param name="PersonCode"></param>
217 218
        /// <param name="ApprovalCode"></param>
218 219
        /// <returns></returns>
219
        public static bool CheckPersonPetition(int PersonCode, int ApprovalCode, DateTime ApprovalDate)
220
        public static bool CheckPersonPetition(int PersonCode, int ApprovalCode, DateTime ApprovalDate, int OrderNo)
220 221
        {
221 222
            IOPersonApproval ApprDB = new IOPersonApproval();
222 223
            try
223 224
            {
224 225
                bool bPetition = false;
225 226
                // 申請データ取得
226
                string strSQL = ApprDB.CreatePrimarykeyString(PersonCode, ApprovalCode, ApprovalDate, 1);
227
                string strSQL = ApprDB.CreatePrimarykeyString(PersonCode, ApprovalCode, ApprovalDate, OrderNo);
227 228
                List<PersonApproval> PetitionList = new List<PersonApproval>();
228 229
                if (!ApprDB.SelectAction(strSQL, ref PetitionList)) return bPetition;
229 230
                // 申請データが無い場合
......
285 286
        /// <param name="PersonCode"></param>
286 287
        /// <param name="ApprovalCode"></param>
287 288
        /// <returns></returns>
288
        public static bool CheckPersonApproval(int PersonCode, int ApprovalCode, DateTime ApprovalDate)
289
        public static bool CheckPersonApproval(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo)
289 290
        {
290 291
            IOPersonApproval ApprDB = new IOPersonApproval();
291 292
            try
292 293
            {
293 294
                // 承認データを取得する(申請データを除く)
294
                string strData = ApprDB.CreatePrimarykeyString(PersonCode, ApprovalCode, ApprovalDate, 1);
295
                string strData = ApprDB.CreatePrimarykeyString(PersonCode, ApprovalCode, OrderDate, OrderNo, 1);
295 296
                PersonApproval DataRec = new PersonApproval();
296 297
                if (!ApprDB.SelectAction(strData, ref DataRec)) return false;
297 298

  
......
397 398
        /// <param name="PersonCode"></param>
398 399
        /// <param name="ApprovalCode"></param>
399 400
        /// <returns></returns>
400
        public static bool CheckPersonApprovalData(int PersonCode, int ApprovalCode, DateTime OrderDate)
401
        public static bool CheckPersonApprovalData(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo)
401 402
        {
402 403
            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
403 404
            IOMApproval mApprDB = new IOMApproval();
......
409 410
                // 承認データを取得する(申請データを除く)
410 411
                string strSQL = "SELECT A.DISPLAYORDER, A.APPROVALPERSON, A.APPROVALAUTHORITY, B.SEQNO, B.APPROVALSTATUS";
411 412
                strSQL += " FROM APPROVALMASTER A";
412
                strSQL += " LEFT JOIN PERSONAPPROVAL B ON B.PERSONCODE = A.APPROVALPERSON AND B.APPROVALCODE = A.APPROVALCODE";
413
                strSQL += string.Format(" AND B.ORDERDATE = TO_DATE('{0}') AND B.SEQNO != 1", OrderDate);
413
                strSQL += " LEFT JOIN PERSONAPPROVAL B ON B.PERSONCODEAPPROVAL = A.APPROVALPERSON AND B.APPROVALCODE = A.APPROVALCODE";
414
                strSQL += string.Format(" AND B.ORDERDATE = TO_DATE('{0}')", OrderDate.ToShortDateString());
415
                strSQL += string.Format(" AND B.ORDERNO = {0} AND B.SEQNO != 1", OrderNo);
414 416
                strSQL += string.Format(" WHERE A.APPROVALCODE = {0}", ApprovalCode);
415 417
                strSQL += " AND A.DEPARTMENTCODE = (SELECT C.DEPARTMENTCODE FROM PERSONINCHARGEMASTER C";
416 418
                strSQL += string.Format(" WHERE C.PERSONCODE = {0})", PersonCode);
......
611 613
        /// 担当者コードと承認機能コードより現在管理担当部署コードを取得する
612 614
        /// </summary>
613 615
        /// <returns></returns>
614
        public static int GetFromPersonAndApprovalTheDepartment(int PersonCode, int ApprovalCode, DateTime OrderDate)
616
        public static int GetFromPersonAndApprovalTheDepartment(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo)
615 617
        {
616 618
            IOMPersonInCharge picDB = new IOMPersonInCharge();
617 619
            IOPersonApproval ApprovalDB = new IOPersonApproval();
618 620
            try
619 621
            {
620 622
                // 管理担当者コードを取得する
621
                string strSQL = ApprovalDB.CreatePrimarykeyString(PersonCode, ApprovalCode, OrderDate, 1);
623
                string strSQL = ApprovalDB.CreatePrimarykeyString(PersonCode, ApprovalCode, OrderDate, OrderNo, 1);
622 624
                PersonApproval ApprovalRec = new PersonApproval();
623 625
                int CurrentPersonCode = 0;
624 626
                if (ApprovalDB.SelectAction(strSQL, ref ApprovalRec))
......
627 629
                }
628 630
                else
629 631
                {
630
                    // データが無い場合(申請時)はログインユーザー
631
                    CurrentPersonCode = CommonMotions.LoginUserData.PersonCode;
632
                    // データが無い場合(申請時)は申請ユーザー
633
                    CurrentPersonCode = PersonCode;
632 634
                }
633 635

  
634 636
                // 担当者部署取得
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs
103 103
            IOPurchaseOrderDetail DB18 = new IOPurchaseOrderDetail();               // 注文書明細データ
104 104

  
105 105
            IOProceedingsData DB19 = new IOProceedingsData();                       // 発注者打ち合わせ議事録データ
106
            IOProceedingsDataAttendee DB20 = new IOProceedingsDataAttendee();       // 発注者打ち合わせ議事録データ(出席者)
106
            IOProceedingsDataAttend DB20 = new IOProceedingsDataAttend();       // 発注者打ち合わせ議事録データ(出席者)
107 107
            IOProceedingsDataDetail DB21 = new IOProceedingsDataDetail();           // 発注者打ち合わせ議事録データ(明細)
108 108
            IODailyDataConstruction DB22 = new IODailyDataConstruction();           // 日報データ
109 109
            IODailyDataDetail DB23 = new IODailyDataDetail();                       // 日報データ (明細)
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
159 159
                                                                                { (int)ProcessExecuteNo.DRList,                 "工事日報-一覧"},
160 160
                                                                                { (int)ProcessExecuteNo.DRConstruction,         "工事日報-入力"},
161 161
                                                                                { (int)ProcessExecuteNo.Proceedings,            "打合せ議事録-入力"},
162
                                                                                { (int)ProcessExecuteNo.MaterialList,           "資材入力"},
163
                                                                                { (int)ProcessExecuteNo.MaterialReserveEntry,   "資材貸出"},
164
                                                                                { (int)ProcessExecuteNo.MaterialReturnEntry,    "資材返却"},
162
                                                                                { (int)ProcessExecuteNo.DRWork,                 "出勤日報-入力"},
163
                                                                                { (int)ProcessExecuteNo.PurchaseOrderStatus,    "注文書発給一覧-表示"},
164
                                                                                { (int)ProcessExecuteNo.OrderJoin,              "工事結合-入力"},
165
                                                                                { (int)ProcessExecuteNo.ConstructionSplit,      "工事分割-入力"},
166
                                                                                { (int)ProcessExecuteNo.PersonApprovalList,     "担当者承認一覧-表示"},
167
                                                                                { (int)ProcessExecuteNo.MaterialList,           "資材入力-入力"},
168
                                                                                { (int)ProcessExecuteNo.MaterialHistory,        "資材履歴画面-表示"},
169
                                                                                { (int)ProcessExecuteNo.MaterialCountEntry,     "資材数変更画面-入力"},
170
                                                                                { (int)ProcessExecuteNo.MaterialReserveEntry,   "資材貸出-入力"},
171
                                                                                { (int)ProcessExecuteNo.MaterialReturnEntry,    "資材返却-入力"},
172
                                                                                { (int)ProcessExecuteNo.MaterialSelect,         "資材選択-入力"},
165 173
                                                                                { (int)ProcessExecuteNo.RequestSummaryList,     "請求まとめ"},
166 174
                                                                                { (int)ProcessExecuteNo.PaymentConfirmation,    "入金確認"},
167 175
                                                                                { (int)ProcessExecuteNo.RequestInput,           "請求入力"},
168
                                                                                { (int)ProcessExecuteNo.RequestPrint,           "請求書印刷"},
169
                                                                                //{ (int)ProcessExecuteNo.DailyReportList,        "出勤日報-入力"},
170
                                                                                //{ (int)ProcessExecuteNo.PurchaseOrderStatus,    "注文書発給状況-一覧"},
171
                                                                                //{ (int)ProcessExecuteNo.OrderJoin,              "工事結合-入力"},
172
                                                                                //{ (int)ProcessExecuteNo.ConstructionSplit,      "工事分割-入力"},
173
                                                                                //{ (int)ProcessExecuteNo.DRTransport,            "通勤交通費-入力"},
176
                                                                                { (int)ProcessExecuteNo.RequestPrint,           "請求書印刷"}
174 177
        };
175 178

  
176 179
        #endregion
......
247 250
            /// </summary>
248 251
            DRConstructionApproval,
249 252
            /// <summary>
250
            /// 7:出勤日報承認
253
            /// 7:議事録承認
251 254
            /// </summary>
255
            DRProceedingsApproval,
256
            /// <summary>
257
            /// 8:出勤管理承認
258
            /// </summary>
252 259
            DRWorkApproval,
253 260
        }
254 261
        #endregion
......
285 292
                                                                                {5, "請求書承認"},
286 293
                                                                                {6, "工事日報承認"},
287 294
                                                                                {7, "議事録承認"},
288
                                                                                {8, "質疑承認"},
295
                                                                                {8, "出勤管理承認"},
289 296
                                                                                };
290 297

  
291 298
        #endregion
......
294 301
        /// <summary>
295 302
        /// 承認種別カラーテーブル(承認処理定義と同じ並び)
296 303
        /// </summary>
304
        //public static Color[] ApprovalTypeColorList = new Color[]{  Color.White,
305
        //                                                            Color.RoyalBlue,
306
        //                                                            Color.DarkOrange,
307
        //                                                            Color.IndianRed,
308
        //                                                            Color.Gray,
309
        //                                                            Color.Chartreuse,
310
        //                                                            Color.SpringGreen,
311
        //                                                            Color.SlateGray,
312
        //                                                            Color.LightSeaGreen,
313
        //                                                            Color.SteelBlue,
314
        //                                                            Color.LawnGreen,
315
        //                                                            Color.DarkViolet,
316
        //                                                            Color.MediumVioletRed,
317
        //                                                            Color.MediumSeaGreen,
318
        //                                                            };
297 319
        public static Color[] ApprovalTypeColorList = new Color[]{  Color.White,
298 320
                                                                    Color.RoyalBlue,
299 321
                                                                    Color.DarkOrange,
300 322
                                                                    Color.IndianRed,
301
                                                                    Color.Gray,
323
                                                                    Color.SlateGray,
302 324
                                                                    Color.Chartreuse,
303
                                                                    Color.SpringGreen,
304
                                                                    Color.SlateGray,
325
                                                                    Color.SteelBlue,
305 326
                                                                    Color.LightSeaGreen,
306
                                                                    Color.SteelBlue,
307
                                                                    Color.LawnGreen,
308 327
                                                                    Color.DarkViolet,
328
                                                                    Color.MediumVioletRed,
329
                                                                    Color.MediumSeaGreen,
330
                                                                    Color.Chocolate,
331
                                                                    Color.DarkGoldenrod,
332
                                                                    Color.OrangeRed,
333
                                                                    Color.DimGray,
334
                                                                    Color.LimeGreen,
335
                                                                    Color.Crimson,
309 336
                                                                    };
337

  
310 338
        #endregion
311 339

  
312 340
        #region 変数
......
551 579
                        case (int)SubFormExecuteNo.ApprovalScreen:                      // 205:承認画面
552 580
                            SubFormExecuteNo_ApprovalScreen(m_ProcControlPara[NowPoint]);
553 581
                            break;
582

  
554 583
                        case (int)SubFormExecuteNo.ApprovalPerson:                      // 209:担当者承認画面
555 584
                            SubFormExecuteNo_ApprovalPerson(m_ProcControlPara[NowPoint]);
556 585
                            break;
......
1329 1358

  
1330 1359
                // パラメータセット
1331 1360
                frm.ConstructionCode = CurrentPara.IntExecParameter[0];
1332
                frm.PersonCode = CurrentPara.IntExecParameter[1];
1361
                frm.OrderNo = CurrentPara.IntExecParameter[1];
1362
                frm.PersonCode = CurrentPara.IntExecParameter[2];
1333 1363
                frm.CreateData = CurrentPara.BoolExecParameter[0];
1334 1364

  
1335 1365
                // フォーム表示
......
1374 1404

  
1375 1405
                // パラメータセット
1376 1406
                frm.ConstructionCode = CurrentPara.IntExecParameter[0];
1407
                frm.OrderNo = CurrentPara.IntExecParameter[1];
1408
                frm.PersonCode = CurrentPara.IntExecParameter[2];
1409
                frm.CreateData = CurrentPara.BoolExecParameter[0];
1377 1410

  
1378 1411
                // フォーム表示
1379 1412
                frm.ShowDialog();
......
1611 1644
                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = (Form)frm;
1612 1645

  
1613 1646
                // 起動・編集フラグ
1614
                //int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1615
                //if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1616
                //{
1617
                //    BackProcess();
1618
                //    return;
1619
                //}
1620
                //if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1647
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1648
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1649
                {
1650
                    BackProcess();
1651
                    return;
1652
                }
1653
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1621 1654

  
1622 1655
                // パラメータセット
1623
                frm.PersonCode = CurrentPara.IntExecParameter[1];
1656
                frm.PersonCode = CurrentPara.IntExecParameter[0];
1657
                if (CurrentPara.StringExecParameter.Count > 0)
1658
                {
1659
                    frm.OrdertDate = CommonMotions.cnvDate(CurrentPara.StringExecParameter[0]);
1660
                }
1624 1661

  
1625 1662
                // フォーム表示
1626 1663
                frm.ShowDialog();
......
2644 2681
            {
2645 2682
                frm.PersonCode = CurrentPara.IntExecParameter[0];
2646 2683
                frm.ApprovalCode = CurrentPara.IntExecParameter[1];
2684
                frm.OrderNo = CurrentPara.IntExecParameter[2];
2647 2685
                frm.OrderDate = CommonMotions.cnvDate(CurrentPara.StringExecParameter[0]);
2648
                for (int i = 3; i < CurrentPara.IntExecParameter.Count; i++)
2649
                {
2650
                    frm.PurchaseOrderSeqNo.Add(CurrentPara.IntExecParameter[i]);
2651
                }
2652 2686

  
2653 2687
                // フォーム表示
2654 2688
                frm.ShowDialog();
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceDailyData.cs
46 46
            /// </summary>
47 47
            SeqNo,
48 48
            /// <summary>
49
            /// 工事番号
49
            /// 行動実績
50 50
            /// </summary>
51
            ConstructionCode,
51
            ActionResult,
52 52
            /// <summary>
53 53
            /// 残業時間
54 54
            /// </summary>
......
92 92
            strcmd += "  PersonCode";                                       // 担当者コード
93 93
            strcmd += " ,TO_CHAR(AttendanceDate, 'YYYY/MM/DD')";            // 日報作成日
94 94
            strcmd += " ,SeqNo";                                            // 明細行番号
95
            strcmd += " ,ConstructionCode";                                 // 工事番号
95
            strcmd += " ,ActionResult";                                     // 行動実績
96 96
            strcmd += " ,OvertimeHours";                                    // 残業時間
97 97
            strcmd += " ,WorkingComment";                                   // コメント
98 98
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
......
183 183
                strcmd += "  (PersonCode";      // 担当者コード
184 184
                strcmd += " ,AttendanceDate";   // 日報作成日
185 185
                strcmd += " ,SeqNo";            // 明細行番号
186
                strcmd += " ,ConstructionCode"; // 工事番号
186
                strcmd += " ,ActionResult"; // 行動実績
187 187
                strcmd += " ,OvertimeHours";    // 残業時間
188 188
                strcmd += " ,WorkingComment";   // コメント
189 189
                strcmd += " ,EntryDate";        // 登録年月日
......
195 195
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
196 196
                                            , work.AttendanceDate.ToShortDateString()); // 日報作成日
197 197
                strcmd += string.Format(", {0}", work.SeqNo);                           // 明細行番号
198
                strcmd += string.Format(", {0}", work.ConstructionCode);                // 工事番号
198
                strcmd += string.Format(",'{0}'", work.ActionResult);                   // 行動実績
199 199
                strcmd += string.Format(", {0}", work.OvertimeHours);                   // 残業時間
200 200
                strcmd += string.Format(",'{0}'", work.WorkingComment);                 // コメント
201 201

  
......
256 256
                strcmd += string.Format(",AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')"
257 257
                                        , data.AttendanceDate.ToShortDateString());             // 日報作成日
258 258
                strcmd += string.Format(",SeqNo =  {0} ", data.SeqNo);                          // 明細行番号
259
                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
259
                strcmd += string.Format(",ActionResult = '{0}'", data.ActionResult);            // 行動実績
260 260
                strcmd += string.Format(",OvertimeHours = {0}", data.OvertimeHours);            // 残業時間
261 261
                strcmd += string.Format(",WorkingComment = '{0}'", data.WorkingComment);        // コメント
262 262
                
......
306 306
        /// <summary>
307 307
        /// 1項目の更新を行う
308 308
        /// </summary>
309
        /// <param name="ConstructionCode"></param>
309
        /// <param name="ActionResult"></param>
310 310
        /// <param name="FeildNo"></param>
311 311
        /// <param name="value"></param>
312 312
        /// <param name="bConnect"></param>
......
330 330
                    case (int)DataColumn.SeqNo:
331 331
                        strcmd += string.Format(" SeqNo = {0}", (int)value);
332 332
                        break;
333
                    case (int)DataColumn.ConstructionCode:
334
                        strcmd += string.Format(" ConstructionCode = {0}", (int)value);
333
                    case (int)DataColumn.ActionResult:
334
                        strcmd += string.Format(" ActionResult = '{0}'", value.ToString());
335 335
                        break;
336 336
                    case (int)DataColumn.OvertimeHours:
337 337
                        strcmd += string.Format(" OvertimeHours = {0}", (double)value);
......
370 370
                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
371 371
                wrk.AttendanceDate = DateTime.Parse(objwrk[(int)DataColumn.AttendanceDate].ToString());     // 日報作成日
372 372
                wrk.SeqNo = int.Parse(objwrk[(int)DataColumn.SeqNo].ToString());                            // 明細行番号
373
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
373
                wrk.ActionResult = objwrk[(int)DataColumn.ActionResult].ToString();                         // 行動実績
374 374
                wrk.OvertimeHours = double.Parse(objwrk[(int)DataColumn.OvertimeHours].ToString());         // 残業時間
375 375
                wrk.WorkingComment = objwrk[(int)DataColumn.WorkingComment].ToString();                     // 当日作業内容
376 376
                
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOAttendanceData.cs
16 16
namespace ProcessManagement.DB.IOAccess
17 17
{
18 18
    /// <summary>
19
    /// 出勤日報データDBアクセス
19
    /// 出勤管理データDBアクセス
20 20
    /// </summary>
21 21
    public class IOAttendanceData : OracleProcess
22 22
    {
......
38 38
            /// </summary>
39 39
            PersonCode,
40 40
            /// <summary>
41
            /// 日報作成日
41
            /// 出勤管理年月
42 42
            /// </summary>
43
            AttendanceDate,
43
            AttendanceMonth,
44 44
            /// <summary>
45
            /// 明細行番号
45
            /// 当月最終日
46 46
            /// </summary>
47
            SeqNo,
47
            LastDays,
48 48
            /// <summary>
49
            /// 工事番号
49
            /// 出勤日数
50 50
            /// </summary>
51
            ConstructionCode,
51
            AttendDayCount,
52 52
            /// <summary>
53
            /// 残業時間
53
            /// 残業時間
54 54
            /// </summary>
55
            OvertimeHours,
55
            TotalOverTimes,
56 56
            /// <summary>
57
            /// コメント
57
            /// 申請受付番号
58 58
            /// </summary>
59
            WorkingComment,
59
            OrderNo,
60 60
            /// <summary>
61 61
            /// 登録年月日
62 62
            /// </summary>
......
90 90
            string strcmd = "SELECT";
91 91

  
92 92
            strcmd += "  PersonCode";                                       // 担当者コード
93
            strcmd += " ,TO_CHAR(AttendanceDate, 'YYYY/MM/DD')";            // 日報作成日
94
            strcmd += " ,SeqNo";                                            // 明細行番号
95
            strcmd += " ,ConstructionCode";                                 // 工事番号
96
            strcmd += " ,OvertimeHours";                                    // 残業時間
97
            strcmd += " ,WorkingComment";                                   // コメント
98
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
99
            strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
93
            strcmd += " ,TO_CHAR(AttendanceMonth, 'YYYY/MM/DD')";           // 出勤管理年月
94
            strcmd += " ,LastDays";                                         // 当月最終日
95
            strcmd += " ,AttendDayCount";                                   // 出勤日数
96
            strcmd += " ,TotalOverTimes";                                   // 残業時間数
97
            strcmd += " ,OrderNo";                                          // 申請受付番号
98
            strcmd += " ,TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
99
            strcmd += " ,TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
100 100
            strcmd += " FROM AttendanceData";
101 101

  
102 102
            return strcmd;
......
181 181
            {
182 182
                strcmd = "INSERT INTO AttendanceData";
183 183
                strcmd += "  (PersonCode";      // 担当者コード
184
                strcmd += " ,AttendanceDate";   // 日報作成日
185
                strcmd += " ,SeqNo";            // 明細行番号
186
                strcmd += " ,ConstructionCode"; // 工事番号
187
                strcmd += " ,OvertimeHours";    // 残業時間
188
                strcmd += " ,WorkingComment";   // コメント
184
                strcmd += " ,AttendanceMonth";  // 出勤管理年月
185
                strcmd += " ,LastDays";         // 当月最終日
186
                strcmd += " ,AttendDayCount";   // 出勤日数
187
                strcmd += " ,TotalOverTimes";   // 残業時間数
188
                strcmd += " ,OrderNo";          // 申請受付番号
189 189
                strcmd += " ,EntryDate";        // 登録年月日
190 190
                strcmd += " ,UpdateDate)";      // 更新年月日
191 191

  
......
193 193

  
194 194
                strcmd += string.Format("  {0}", work.PersonCode);                      // 担当者コード
195 195
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
196
                                            , work.AttendanceDate.ToShortDateString()); // 日報作成日
197
                strcmd += string.Format(", {0}", work.SeqNo);                           // 明細行番号
198
                strcmd += string.Format(", {0}", work.ConstructionCode);                // 工事番号
199
                strcmd += string.Format(", {0}", work.OvertimeHours);                   // 残業時間
200
                strcmd += string.Format(",'{0}'", work.WorkingComment);                 // コメント
196
                                            , work.AttendanceMonth.ToShortDateString());// 日報作成日
197
                strcmd += string.Format(", {0}", work.LastDays);                        // 当月最終日
198
                strcmd += string.Format(", {0}", work.AttendDayCount);                  // 出勤日数
199
                strcmd += string.Format(", {0}", work.TotalOverTimes);                  // 残業時間数
200
                strcmd += string.Format(", {0}", work.OrderNo);                         // 申請受付番号
201 201

  
202 202
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
203 203
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
253 253
                strcmd += " SET";
254 254

  
255 255
                strcmd += string.Format(" PersonCode = {0}", data.PersonCode);                  // 担当者コード
256
                strcmd += string.Format(",AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')"
257
                                        , data.AttendanceDate.ToShortDateString());             // 日報作成日
258
                strcmd += string.Format(",SeqNo =  {0} ", data.SeqNo);                          // 明細行番号
259
                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
260
                strcmd += string.Format(",OvertimeHours = {0}", data.OvertimeHours);            // 残業時間
261
                strcmd += string.Format(",WorkingComment = '{0}'", data.WorkingComment);        // コメント
256
                strcmd += string.Format(" ,AttendanceMonth = TO_DATE('{0}','YYYY/MM/DD')"
257
                                        , data.AttendanceMonth.ToShortDateString());            // 出勤管理年月
258
                strcmd += string.Format(" ,LastDays =  {0} ", data.LastDays);                   // 当月最終日
259
                strcmd += string.Format(" ,AttendDayCount =  {0} ", data.AttendDayCount);       // 出勤日数
260
                strcmd += string.Format(" ,TotalOverTimes =  {0} ", data.TotalOverTimes);       // 残業時間数
261
                strcmd += string.Format(" ,OrderNo =  {0} ", data.OrderNo);                     // 申請受付番号
262 262
                
263 263
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
264 264
                strcmd += AddSQLString;
......
311 311
        /// <param name="value"></param>
312 312
        /// <param name="bConnect"></param>
313 313
        /// <returns></returns>
314
        public bool UpdateFeild(int PersonCode, DateTime AttendanceDate, int SeqNo, int FeildNo, object value, bool bConnect = true)
314
        public bool UpdateFeild(int PersonCode, DateTime AttendanceMonth, int FeildNo, object value, bool bConnect = true)
315 315
        {
316 316
            string strcmd = "";
317 317
            try
......
324 324
                    case (int)DataColumn.PersonCode:
325 325
                        strcmd += string.Format(" PersonCode = {0}", (int)value);
326 326
                        break;
327
                    case (int)DataColumn.AttendanceDate:
328
                        strcmd += string.Format(" AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString());
327
                    case (int)DataColumn.AttendanceMonth:
328
                        strcmd += string.Format(" AttendanceMonth = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString());
329 329
                        break;
330
                    case (int)DataColumn.SeqNo:
331
                        strcmd += string.Format(" SeqNo = {0}", (int)value);
330
                    case (int)DataColumn.LastDays:
331
                        strcmd += string.Format(" LastDays = {0}", (int)value);
332 332
                        break;
333
                    case (int)DataColumn.ConstructionCode:
334
                        strcmd += string.Format(" ConstructionCode = {0}", (int)value);
333
                    case (int)DataColumn.AttendDayCount:
334
                        strcmd += string.Format(" AttendDayCount = {0}", (int)value);
335 335
                        break;
336
                    case (int)DataColumn.OvertimeHours:
337
                        strcmd += string.Format(" OvertimeHours = {0}", (double)value);
336
                    case (int)DataColumn.TotalOverTimes:
337
                        strcmd += string.Format(" TotalOverTimes = {0}", (double)value);
338 338
                        break;
339
                    case (int)DataColumn.WorkingComment:
340
                        strcmd += string.Format(" WorkingComment = '{0}'", CommonMotions.cnvString(value));
339
                    case (int)DataColumn.OrderNo:
340
                        strcmd += string.Format(" OrderNo = {0}", (int)value);
341 341
                        break;
342 342
                }
343 343

  
344 344
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
345
                strcmd += CreatePrimarykeyString(PersonCode, AttendanceDate, SeqNo);
345
                strcmd += CreatePrimarykeyString(PersonCode, AttendanceMonth);
346 346

  
347 347
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
348 348

  
......
368 368
            {
369 369
                // データ取得
370 370
                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
371
                wrk.AttendanceDate = DateTime.Parse(objwrk[(int)DataColumn.AttendanceDate].ToString());     // 日報作成日
372
                wrk.SeqNo = int.Parse(objwrk[(int)DataColumn.SeqNo].ToString());                            // 明細行番号
373
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
374
                wrk.OvertimeHours = double.Parse(objwrk[(int)DataColumn.OvertimeHours].ToString());         // 残業時間
375
                wrk.WorkingComment = objwrk[(int)DataColumn.WorkingComment].ToString();                     // 当日作業内容
371
                wrk.AttendanceMonth = DateTime.Parse(objwrk[(int)DataColumn.AttendanceMonth].ToString());   // 出勤管理年月
372
                wrk.LastDays = int.Parse(objwrk[(int)DataColumn.LastDays].ToString());                      // 当月最終日
373
                wrk.AttendDayCount = int.Parse(objwrk[(int)DataColumn.AttendDayCount].ToString());          // 出勤日数
374
                wrk.TotalOverTimes = double.Parse(objwrk[(int)DataColumn.TotalOverTimes].ToString());       // 残業時間数
375
                wrk.OrderNo = int.Parse(objwrk[(int)DataColumn.OrderNo].ToString());                        // 申請受付番号
376 376
                
377 377
                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
378 378
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
......
397 397
        /// <param name="DataType"></param>
398 398
        /// <param name="DataAddCount"></param>
399 399
        /// <returns></returns>
400
        public string CreatePrimarykeyString(int PersonCode, DateTime AttendanceDate, int SeqNo = 0)
400
        public string CreatePrimarykeyString(int PersonCode, DateTime AttendanceMonth)
401 401
        {
402 402
            string strWork = "";
403 403
            try
404 404
            {
405 405
                strWork = string.Format(" WHERE PersonCode = {0}", PersonCode);
406
                if (AttendanceDate != DateTime.MinValue)
407
                    strWork += string.Format(" AND AttendanceDate = TO_DATE('{0}','YYYY/MM/DD')", AttendanceDate.ToShortDateString());
408
                if (SeqNo != 0)
409
                    strWork += string.Format(" AND SeqNo = {0}", SeqNo);
406
                if (AttendanceMonth != DateTime.MinValue)
407
                    strWork += string.Format(" AND AttendanceMonth = TO_DATE('{0}','YYYY/MM/DD')", AttendanceMonth.ToShortDateString());
410 408
            }
411 409
            catch (Exception ex)
412 410
            {
......
416 414
            return strWork;
417 415
        }
418 416
        #endregion
419

  
420
        #region 追加番号の最大値を取得
421
        /// <summary>
422
        /// 追加番号の最大値を取得する
423
        /// </summary>
424
        /// <param name="AddSQLString"></param>
425
        /// <param name="bConnect"></param>
426
        /// <returns></returns>
427
        public int SelectMaxAddDataCount(string AddSQLString, bool bConnect = true)
428
        {
429
            //Oracle インターフェース
430
            string strcmd = "";
431
            ArrayList arData = new ArrayList();
432
            int iRet = 0;
433
            try
434
            {
435
                // SQL作成
436
                strcmd = "SELECT NVL(MAX(SeqNo), 0) FROM AttendanceData" + AddSQLString;
437

  
438
                // SQL実行
439
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
440

  
441
                // データセット
442
                foreach (object[] objwrk in arData)
443
                {
444
                    if (objwrk[0].ToString().Equals("null"))
445
                        iRet = 0;
446
                    else
447
                        iRet = int.Parse(objwrk[0].ToString());
448
                }
449

  
450
            }
451
            catch (Exception ex)
452
            {
453
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
454
            }
455
            return iRet;
456
        }
457
        #endregion
458 417
    }
459 418
}
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApprovalCommnet.cs
18 18
    /// <summary>
19 19
    /// 担当者承認コメントデータアクセスクラス
20 20
    /// </summary>
21
    public class IOPersonApprovalCommnet : OracleProcess
21
    public class IOPersonApprovalComment : OracleProcess
22 22
    {
23 23
        #region 定義部
24 24
        /// <summary>
......
50 50
        /// コンストラクタ
51 51
        /// </summary>
52 52
        /// <param name="ConnectionString"></param>
53
        public IOPersonApprovalCommnet()
53
        public IOPersonApprovalComment()
54 54
            : base(DBCommon.Instance.DBConnectString)
55 55
        {
56 56
        }
......
70 70
            string strcmd = "SELECT";
71 71
            strcmd += " PersonCode";
72 72
            strcmd += ",ApprovalCode";
73
            strcmd += ",OrderDate";
73
            strcmd += ",TO_CHAR(OrderDate, 'YYYY/MM/DD')";
74 74
            strcmd += ",OrderNo";
75 75
            strcmd += ",CommentNo";
76 76
            strcmd += ",ParentNo";
77 77
            strcmd += ",ApproValComment";
78 78
            strcmd += ",TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";
79 79
            strcmd += ",TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";
80
            strcmd += " FROM PersonApprovalCommnet";
80
            strcmd += " FROM PersonApprovalComment";
81 81

  
82 82
            return strcmd;
83 83
        }
......
91 91
        /// <param name="data"></param>
92 92
        /// <param name="bConnect"></param>
93 93
        /// <returns></returns>
94
        public bool SelectAction(string AddSQLString, ref List<PersonApprovalCommnet> data, bool bConnect = true)
94
        public bool SelectAction(string AddSQLString, ref List<PersonApprovalComment> data, bool bConnect = true)
95 95
        {
96 96
            //Oracle インターフェース
97 97
            string strcmd = "";
......
108 108
                // データセット
109 109
                foreach (object[] objwrk in arData)
110 110
                {
111
                    PersonApprovalCommnet work = new PersonApprovalCommnet();
111
                    PersonApprovalComment work = new PersonApprovalComment();
112 112
                    Reader2Struct(objwrk, ref work);
113 113
                    data.Add(work);
114 114
                }
......
132 132
        /// <param name="data"></param>
133 133
        /// <param name="bConnect"></param>
134 134
        /// <returns></returns>
135
        public bool SelectAction(string AddSQLString, ref PersonApprovalCommnet data, bool bConnect = true)
135
        public bool SelectAction(string AddSQLString, ref PersonApprovalComment data, bool bConnect = true)
136 136
        {
137 137
            //Oracle インターフェース
138 138
            string strcmd = "";
......
168 168
        /// </summary>
169 169
        /// <param name="data">承認コメントデータデータ</param>
170 170
        /// <returns>true:成功 false:失敗</returns>
171
        public bool InsertAction(List<PersonApprovalCommnet> data, bool bConnect = true)
171
        public bool InsertAction(List<PersonApprovalComment> data, bool bConnect = true)
172 172
        {
173 173
            string strcmd = "";
174 174
            try
175 175
            {
176
                foreach (PersonApprovalCommnet work in data)
176
                foreach (PersonApprovalComment work in data)
177 177
                {
178 178
                    if (!InsertAction(work, bConnect)) return false;
179 179
                }
......
194 194
        /// <param name="data"></param>
195 195
        /// <param name="bConnect"></param>
196 196
        /// <returns></returns>
197
        public bool InsertAction(PersonApprovalCommnet data, bool bConnect = true)
197
        public bool InsertAction(PersonApprovalComment data, bool bConnect = true)
198 198
        {
199 199
            string strcmd = "";
200 200
            try
201 201
            {
202

  
203
                    strcmd = "INSERT INTO PersonApprovalCommnet";
202
                    strcmd = "INSERT INTO PersonApprovalComment";
204 203
                    strcmd += " (PersonCode";
205 204
                    strcmd += ",ApprovalCode";
206 205
                    strcmd += ",OrderDate";
......
244 243
        /// <param name="AddSQLString">更新条件SQL文字列</param>
245 244
        /// <param name="data">承認コメントデータデータ</param>
246 245
        /// <returns>true:成功 false:失敗</returns>
247
        public bool UpdateAction(string AddSQLString, PersonApprovalCommnet data, bool bConnect = true)
246
        public bool UpdateAction(string AddSQLString, PersonApprovalComment data, bool bConnect = true)
248 247
        {
249 248
            string strcmd = "";
250 249
            try
251 250
            {
252 251

  
253
                strcmd = "UPDATE PersonApprovalCommnet";
252
                strcmd = "UPDATE PersonApprovalComment";
254 253

  
255 254
                strcmd += " SET";
256 255

  
......
290 289
            string strcmd = "";
291 290
            try
292 291
            {
293
                strcmd = string.Format("{0}{1}", "DELETE FROM PersonApprovalCommnet", AddSQLString);
292
                strcmd = string.Format("{0}{1}", "DELETE FROM PersonApprovalComment", AddSQLString);
294 293

  
295 294
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
296 295

  
......
314 313
            string strcmd = "";
315 314
            try
316 315
            {
317
                strcmd = "UPDATE PersonApprovalCommnet";
316
                strcmd = "UPDATE PersonApprovalComment";
318 317

  
319 318
                strcmd += " SET";
320 319
                switch (FeildNo)
......
363 362
        /// </summary>
364 363
        /// <param name="reader">OracleDataReader</param>
365 364
        /// <param name="wrk">構造体</param>
366
        public void Reader2Struct(object[] objwrk, ref PersonApprovalCommnet wrk)
365
        public void Reader2Struct(object[] objwrk, ref PersonApprovalComment wrk)
367 366
        {
368 367
            try
369 368
            {
......
396 395
        /// </summary>
397 396
        /// <param name="BusinessTypeCode"></param>
398 397
        /// <returns>Where文字列</returns>
399
        public string CreatePrimarykeyString(int ConstructionCode, int ApprovalCode, DateTime OrderDate, int OrderNo = 0, int CommentNo = 0, string APara = "")
398
        public string CreatePrimarykeyString(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo = 0, int CommentNo = 0, string APara = "")
400 399
        {
401 400
            string strWork = string.Empty;
402 401
            try
403 402
            {
404
                strWork = string.Format(" Where {0}ConstructionCode = {1}", APara, ConstructionCode.ToString());
403
                strWork = string.Format(" Where {0}PersonCode = {1}", APara, PersonCode.ToString());
405 404
                strWork += string.Format(" And {0}ApprovalCode = {1}", APara, ApprovalCode.ToString());
406 405
                strWork += string.Format(" And {0}OrderDate = TO_DATE('{1}','YYYY/MM/DD')", APara, OrderDate.ToShortDateString());
407 406
                if (OrderNo != 0)
......
432 431
            try
433 432
            {
434 433
                // SQL作成
435
                strcmd = "SELECT NVL(MAX(CommentNo), 0) FROM PersonApprovalCommnet" + AddSQLString;
434
                strcmd = "SELECT NVL(MAX(CommentNo), 0) FROM PersonApprovalComment" + AddSQLString;
436 435

  
437 436
                // SQL実行
438 437
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProceedingsData.cs
34 34
        public enum DataColumn
35 35
        {
36 36
            /// <summary>
37
            /// 作成者コード
37
            /// 工事番号
38 38
            /// </summary>
39
            PersonCode,
39
            ConstructionCode,
40 40
            /// <summary>
41 41
            /// 議事録作成日
42 42
            /// </summary>
43 43
            ProceedingsDataDate,
44 44
            /// <summary>
45
            /// 工事番号
46
            /// </summary>
47
            ConstructionCode,
48
            /// <summary>
49 45
            /// 会議時間開始
50 46
            /// </summary>
51 47
            StartMeetingTime,
......
54 50
            /// </summary>
55 51
            EndMeetingTime,
56 52
            /// <summary>
57
            /// 打合せ場所1
53
            /// 作成者コード
58 54
            /// </summary>
59
            MeetingPalce1,
55
            CreatorCode,
60 56
            /// <summary>
61
            /// 打合せ場所2
57
            /// 現地フラグ
62 58
            /// </summary>
63
            MeetingPalce2,
59
            PalceFlag,
64 60
            /// <summary>
65
            /// 打合せ場所
61
            /// 打合せ場所
66 62
            /// </summary>
67
            MeetingPalce3,
63
            MeetingPalce,
68 64
            /// <summary>
69 65
            /// 登録年月日
70 66
            /// </summary>
......
97 93
            // SQL作成(oracleのDateTime型が変換できないのでCharに変換しておく)
98 94
            string strcmd = "SELECT";
99 95

  
100
            strcmd += "  PersonCode";                                       // 担当者コード
96
            strcmd += "  ConstructionCode";                                 // 工事番号
101 97
            strcmd += " ,TO_CHAR(ProceedingsDataDate, 'YYYY/MM/DD')";       // 議事録作成日
102
            strcmd += " ,ConstructionCode";                                 // 工事番号
103
            strcmd += " ,TO_CHAR(StartMeetingTime, 'YYYY/MM/DD')";          // 会議時間開始
104
            strcmd += " ,TO_CHAR(EndMeetingTime, 'YYYY/MM/DD')";            // 会議時間終了
105
            strcmd += " ,MeetingPalce1";                                    // 打合せ場所1
106
            strcmd += " ,MeetingPalce2";                                    // 打合せ場所2
107
            strcmd += " ,MeetingPalce3";                                    // 打合せ場所3
98
            strcmd += " ,StartMeetingTime";                                 // 会議時間開始
99
            strcmd += " ,EndMeetingTime";                                   // 会議時間終了
100
            strcmd += " ,CreatorCode";                                      // 作成者コード
101
            strcmd += " ,PalceFlag";                                        // 現地フラグ
102
            strcmd += " ,MeetingPalce";                                     // 打合せ場所
108 103
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
109 104
            strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
110 105
            strcmd += " FROM ProceedingsData";
......
191 186
            {
192 187
                strcmd = "INSERT INTO ProceedingsData";
193 188

  
194
                strcmd += " VALUES (";
189
                strcmd += " (";
190
                bool bFirst = true;
191
                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
192
                {
193
                    if (!bFirst) strcmd += " ,";
194
                    strcmd += gender.ToString();
195
                    bFirst = false;
196
                }
197
                strcmd += ") VALUES (";
195 198

  
196
                strcmd += string.Format("  {0}", work.PersonCode);                          // 担当者コード
199
                strcmd += string.Format("{0}", work.ConstructionCode);                      // 工事番号
197 200
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
198 201
                                            , work.ProceedingsDataDate.ToShortDateString());// 議事録作成日
199
                strcmd += string.Format(", {0}", work.ConstructionCode);                    // 工事番号
200
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
201
                                            , work.StartMeetingTime.ToShortDateString());   // 会議時間開始
202
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
203
                                            , work.StartMeetingTime.ToShortDateString());   // 会議時間終了
204
                strcmd += string.Format(",'{0}'", work.MeetingPalce1);                      // 打合せ場所1
205
                strcmd += string.Format(",'{0}'", work.MeetingPalce2);                      // 打合せ場所2
206
                strcmd += string.Format(",'{0}'", work.MeetingPalce3);                      // 打合せ場所3
202
                strcmd += string.Format(", {0}", work.StartMeetingTime);                    // 会議時間開始
203
                strcmd += string.Format(", {0}", work.EndMeetingTime);                      // 会議時間終了
204
                strcmd += string.Format(", {0}", work.CreatorCode);                         // 作成者コード
205
                strcmd += string.Format(", {0}", work.PalceFlag);                           // 現地フラグ
206
                strcmd += string.Format(",'{0}'", work.MeetingPalce);                       // 打合せ場所1
207 207

  
208 208
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
209 209
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
259 259

  
260 260
                strcmd += " SET";
261 261

  
262
                strcmd += string.Format(" PersonCode = {0}", data.PersonCode);                  // 担当者コード
262
                strcmd += string.Format(" ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
263 263
                strcmd += string.Format(",ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')"
264 264
                                        , data.ProceedingsDataDate.ToShortDateString());        // 議事録作成日
265
                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
266
                strcmd += string.Format(",StartMeetingTime = TO_DATE('{0}','YYYY/MM/DD')"
267
                                        , data.StartMeetingTime.ToShortDateString());           // 会議時間開始
268
                strcmd += string.Format(",EndMeetingTime = TO_DATE('{0}','YYYY/MM/DD')"
269
                                        , data.EndMeetingTime.ToShortDateString());             // 会議時間終了
270
                strcmd += string.Format(",MeetingPalce1 = '{0}'", data.MeetingPalce1);          // 打合せ場所1
271
                strcmd += string.Format(",MeetingPalce2 = '{0}'", data.MeetingPalce2);          // 打合せ場所2
272
                strcmd += string.Format(",MeetingPalce3 = '{0}'", data.MeetingPalce3);          // 打合せ場所3
265
                strcmd += string.Format(",StartMeetingTime = {0}", data.StartMeetingTime);      // 会議時間開始
266
                strcmd += string.Format(",EndMeetingTime = {0}", data.EndMeetingTime);          // 会議時間終了
267
                strcmd += string.Format(",CreatorCode = {0}", data.CreatorCode);                // 作成者コード
268
                strcmd += string.Format(",PalceFlag = {0}", data.PalceFlag);                    // 現地フラグ
269
                strcmd += string.Format(",MeetingPalce = '{0}'", data.MeetingPalce);            // 打合せ場所
273 270

  
274 271
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
275 272
                strcmd += AddSQLString;
......
324 321
            try
325 322
            {
326 323
                // データ取得
327
                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
324
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
328 325
                wrk.ProceedingsDataDate = DateTime.Parse(objwrk[(int)DataColumn.ProceedingsDataDate].ToString());       // 議事録作成日
329
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
330
                wrk.StartMeetingTime = DateTime.Parse(objwrk[(int)DataColumn.StartMeetingTime].ToString()); // 会議時間開始
331
                wrk.EndMeetingTime = DateTime.Parse(objwrk[(int)DataColumn.EndMeetingTime].ToString());     // 会議時間終了
326
                wrk.StartMeetingTime = int.Parse(objwrk[(int)DataColumn.StartMeetingTime].ToString());      // 会議時間開始
327
                wrk.EndMeetingTime = int.Parse(objwrk[(int)DataColumn.EndMeetingTime].ToString());          // 会議時間終了
328
                wrk.CreatorCode = int.Parse(objwrk[(int)DataColumn.CreatorCode].ToString());                // 作成者コード
329
                wrk.PalceFlag = int.Parse(objwrk[(int)DataColumn.PalceFlag].ToString());                    // 現地フラグ
332 330

  
333
                wrk.MeetingPalce1 = objwrk[(int)DataColumn.MeetingPalce1].ToString();                       // 打合せ場所1
334
                wrk.MeetingPalce2 = objwrk[(int)DataColumn.MeetingPalce2].ToString();                       // 打合せ場所2
335
                wrk.MeetingPalce3 = objwrk[(int)DataColumn.MeetingPalce3].ToString();                       // 打合せ場所3
331
                wrk.MeetingPalce = objwrk[(int)DataColumn.MeetingPalce].ToString();                         // 打合せ場所
336 332

  
337 333
                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
338 334
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
......
352 348
        /// <summary>
353 349
        /// 主キー検索の文字列を返す
354 350
        /// </summary>
355
        /// <param name="PersonCode"></param>
351
        /// <param name="CreatorCode"></param>
356 352
        /// <param name="ActionDate"></param>
357 353
        /// <param name="DataType"></param>
358 354
        /// <param name="DataAddCount"></param>
359 355
        /// <returns></returns>
360
        public string CreatePrimarykeyString(int PersonCode, DateTime ProceedingsDataDate, int ConstructionCode)
356
        public string CreatePrimarykeyString(int ConstructionCode, DateTime ProceedingsDataDate, int StartMeetingTime = 0)
361 357
        {
362 358
            string strWork = "";
363 359
            try
364 360
            {
365
                strWork = string.Format(" WHERE PersonCode = {0}", PersonCode);
361
                strWork += string.Format(" WHERE ConstructionCode = {0}", ConstructionCode);
366 362
                if (ProceedingsDataDate != DateTime.MinValue)
367 363
                    strWork += string.Format(" AND ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')", ProceedingsDataDate.ToShortDateString());
368
                if (ConstructionCode != 0)
369
                    strWork += string.Format(" AND ConstructionCode = {0}", ConstructionCode);
364
                if (StartMeetingTime != 0)
365
                    strWork += string.Format(" AND StartMeetingTime = {0}", StartMeetingTime);
370 366
            }
371 367
            catch (Exception ex)
372 368
            {
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProceedingsDataAttendee.cs
18 18
    /// <summary>
19 19
    /// 発注者打ち合わせ議事録データアクセス(出席者)
20 20
    /// </summary>
21
    public class IOProceedingsDataAttendee : OracleProcess
21
    public class IOProceedingsDataAttend : OracleProcess
22 22
    {
23 23
        #region 定義部
24 24
        /// <summary>
......
34 34
        public enum DataColumn
35 35
        {
36 36
            /// <summary>
37
            /// 作成者コード
37
            /// 工事番号
38 38
            /// </summary>
39
            PersonCode,
39
            ConstructionCode,
40 40
            /// <summary>
41 41
            /// 議事録作成日
42 42
            /// </summary>
43 43
            ProceedingsDataDate,
44 44
            /// <summary>
45
            /// 工事番号
45
            /// 会議時間開始
46 46
            /// </summary>
47
            ConstructionCode,
47
            StartMeetingTime,
48 48
            /// <summary>
49 49
            /// データ行番号
50 50
            /// </summary>
......
56 56
            /// <summary>
57 57
            /// 出席者氏名
58 58
            /// </summary>
59
            AttendeeName,
59
            AttendName,
60 60
            /// <summary>
61 61
            /// 登録年月日
62 62
            /// </summary>
......
73 73
        /// コンストラクタ
74 74
        /// </summary>
75 75
        /// <param name="ConnectionString"></param>
76
        public IOProceedingsDataAttendee()
76
        public IOProceedingsDataAttend()
77 77
            : base(DBCommon.Instance.DBConnectString)
78 78
        {
79 79
        }
......
89 89
            // SQL作成(oracleのDateTime型が変換できないのでCharに変換しておく)
90 90
            string strcmd = "SELECT";
91 91

  
92
            strcmd += "  PersonCode";                                       // 担当者コード
92
            strcmd += " ConstructionCode";                                  // 工事番号
93 93
            strcmd += " ,TO_CHAR(ProceedingsDataDate, 'YYYY/MM/DD')";       // 議事録作成日
94
            strcmd += " ,ConstructionCode";                                 // 工事番号
94
            strcmd += " ,StartMeetingTime";                                 // 会議時間開始
95 95
            strcmd += " ,SeqNo";                                            // データ行番号
96 96
            strcmd += " ,Department";                                       // 出席者所属
97
            strcmd += " ,AttendeeName";                                     // 出席者氏名
97
            strcmd += " ,AttendName";                                       // 出席者氏名
98 98
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
99 99
            strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
100
            strcmd += " FROM ProceedingsDataAttendee";
100
            strcmd += " FROM ProceedingsDataAttend";
101 101

  
102 102
            return strcmd;
103 103
        }
104 104
        #endregion
105 105

  
106 106
        #region 複数読込み処理
107
        public bool SelectAction(string AddSQLString, ref List<ProceedingsDataAttendee> data, bool bConnect = true)
107
        public bool SelectAction(string AddSQLString, ref List<ProceedingsDataAttend> data, bool bConnect = true)
108 108
        {
109 109
            //Oracle インターフェース
110 110
            string strcmd = "";
......
121 121
                // データセット
122 122
                foreach (object[] objwrk in arData)
123 123
                {
124
                    ProceedingsDataAttendee work = new ProceedingsDataAttendee();
124
                    ProceedingsDataAttend work = new ProceedingsDataAttend();
125 125
                    Reader2Struct(objwrk, ref work);
126 126
                    data.Add(work);
127 127
                }
......
137 137
        #endregion
138 138

  
139 139
        #region 1件読込み処理
140
        public bool SelectAction(string AddSQLString, ref ProceedingsDataAttendee data, bool bConnect = true)
140
        public bool SelectAction(string AddSQLString, ref ProceedingsDataAttend data, bool bConnect = true)
141 141
        {
142 142
            //Oracle インターフェース
143 143
            string strcmd = "";
......
174 174
        /// </summary>
175 175
        /// <param name="data">担当者毎経費データデータ</param>
176 176
        /// <returns>true:成功 false:失敗</returns>
177
        public bool InsertAction(ProceedingsDataAttendee work, bool bConnect = true)
177
        public bool InsertAction(ProceedingsDataAttend work, bool bConnect = true)
178 178
        {
179 179
            string strcmd = "";
180 180
            try
181 181
            {
182
                strcmd = "INSERT INTO ProceedingsDataAttendee";
182
                strcmd = "INSERT INTO ProceedingsDataAttend";
183 183

  
184
                strcmd += " VALUES (";
184
                strcmd += " (";
185
                bool bFirst = true;
186
                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
187
                {
188
                    if (!bFirst) strcmd += " ,";
189
                    strcmd += gender.ToString();
190
                    bFirst = false;
191
                }
192
                strcmd += ") VALUES (";
185 193

  
186
                strcmd += string.Format("  {0}", work.PersonCode);                          // 担当者コード
194
                strcmd += string.Format(" {0}", work.ConstructionCode);                     // 工事番号
195
                
187 196
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
188
                                            , work.ProceedingsDataDate.ToShortDateString());      // 議事録作成日
189
                strcmd += string.Format(", {0}", work.ConstructionCode);                    // 工事番号
197
                                            , work.ProceedingsDataDate.ToShortDateString());// 議事録作成日
198

  
199
                strcmd += string.Format(", {0}", work.StartMeetingTime);                    // 会議時間開始
190 200
                strcmd += string.Format(", {0}", work.SeqNo);                               // データ行番号
191 201

  
192 202
                strcmd += string.Format(",'{0}'", work.Department);                         // 出席者所属
193
                strcmd += string.Format(",'{0}'", work.AttendeeName);                       // 出席者氏名
203
                strcmd += string.Format(",'{0}'", work.AttendName);                         // 出席者氏名
194 204

  
195 205
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
196 206
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
209 219
        #endregion
210 220

  
211 221
        #region 複数追加処理
212
        public bool InsertAction(List<ProceedingsDataAttendee> data, bool bConnect = true)
222
        public bool InsertAction(List<ProceedingsDataAttend> data, bool bConnect = true)
213 223
        {
214 224
            string strcmd = "";
215 225
            try
216 226
            {
217 227

  
218
                foreach (ProceedingsDataAttendee work in data)
228
                foreach (ProceedingsDataAttend work in data)
219 229
                {
220 230
                    if (!InsertAction(work, bConnect)) return false;
221 231
                }
......
236 246
        /// <param name="AddSQLString">更新条件SQL文字列</param>
237 247
        /// <param name="data">担当者毎経費データデータ</param>
238 248
        /// <returns>true:成功 false:失敗</returns>
239
        public bool UpdateAction(string AddSQLString, ProceedingsDataAttendee data, bool bConnect = true)
249
        public bool UpdateAction(string AddSQLString, ProceedingsDataAttend data, bool bConnect = true)
240 250
        {
241 251
            string strcmd = "";
242 252
            try
243 253
            {
244 254

  
245
                strcmd = "UPDATE ProceedingsDataAttendee";
255
                strcmd = "UPDATE ProceedingsDataAttend";
246 256

  
247 257
                strcmd += " SET";
248 258

  
249
                strcmd += string.Format(" PersonCode = {0}", data.PersonCode);                  // 担当者コード
259
                strcmd += string.Format(" ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
260
                
250 261
                strcmd += string.Format(",ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')"
251 262
                                        , data.ProceedingsDataDate.ToShortDateString());        // 議事録作成日
252
                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
263

  
264
                strcmd += string.Format(",StartMeetingTime = {0}", data.StartMeetingTime);      // 会議時間開始
253 265
                strcmd += string.Format(",SeqNo = {0}", data.SeqNo);                            // データ行番号
254 266

  
255 267
                strcmd += string.Format(",Department = '{0}'", data.Department);                // 出席者所属
256
                strcmd += string.Format(",AttendeeName = '{0}'", data.AttendeeName);            // 出席者氏名
268
                strcmd += string.Format(",AttendName = '{0}'", data.AttendName);                // 出席者氏名
257 269

  
258 270
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
259 271
                strcmd += AddSQLString;
......
283 295
            string strcmd = "";
284 296
            try
285 297
            {
286
                strcmd = string.Format("{0}{1}", "DELETE FROM ProceedingsDataAttendee", AddSQLString);
298
                strcmd = string.Format("{0}{1}", "DELETE FROM ProceedingsDataAttend", AddSQLString);
287 299

  
288 300
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
289 301

  
......
303 315
        /// </summary>
304 316
        /// <param name="reader">OracleDataReader</param>
305 317
        /// <param name="wrk">構造体</param>
306
        public void Reader2Struct(object[] objwrk, ref ProceedingsDataAttendee wrk)
318
        public void Reader2Struct(object[] objwrk, ref ProceedingsDataAttend wrk)
307 319
        {
308 320
            try
309 321
            {
310 322
                // データ取得
311
                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
323
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
312 324
                wrk.ProceedingsDataDate = DateTime.Parse(objwrk[(int)DataColumn.ProceedingsDataDate].ToString());       // 議事録作成日
313
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
325
                wrk.StartMeetingTime = int.Parse(objwrk[(int)DataColumn.StartMeetingTime].ToString());      // 会議時間開始
314 326
                wrk.SeqNo = int.Parse(objwrk[(int)DataColumn.SeqNo].ToString());                            // データ行番号
315 327

  
316 328
                wrk.Department = objwrk[(int)DataColumn.Department].ToString();                             // 出席者所属
317
                wrk.AttendeeName = objwrk[(int)DataColumn.AttendeeName].ToString();                         // 出席者氏名
329
                wrk.AttendName = objwrk[(int)DataColumn.AttendName].ToString();                             // 出席者氏名
318 330

  
319 331
                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
320 332
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
......
339 351
        /// <param name="DataType"></param>
340 352
        /// <param name="DataAddCount"></param>
341 353
        /// <returns></returns>
342
        public string CreatePrimarykeyString(int PersonCode, DateTime ProceedingsDataDate, int ConstructionCode)
354
        public string CreatePrimarykeyString(int ConstructionCode, DateTime ProceedingsDataDate, int StartMeetingTime = 0, int SeqNo = 0)
343 355
        {
344 356
            string strWork = "";
345 357
            try
346 358
            {
347
                strWork = string.Format(" WHERE PersonCode = {0}", PersonCode);
359
                strWork = string.Format(" WHERE ConstructionCode = {0}", ConstructionCode);
348 360
                if (ProceedingsDataDate != DateTime.MinValue)
349 361
                    strWork += string.Format(" AND ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')", ProceedingsDataDate.ToShortDateString());
350
                if (ConstructionCode != 0)
351
                    strWork += string.Format(" AND ConstructionCode = {0}", ConstructionCode);
362
                if (StartMeetingTime != 0)
363
                    strWork += string.Format(" AND StartMeetingTime = {0}", StartMeetingTime);
364
                if (SeqNo != 0)
365
                    strWork += string.Format(" AND SeqNo = {0}", SeqNo);
352 366
            }
353 367
            catch (Exception ex)
354 368
            {
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProceedingsDataDetail.cs
34 34
        public enum DataColumn
35 35
        {
36 36
            /// <summary>
37
            /// 作成者コード
37
            /// 工事番号
38 38
            /// </summary>
39
            PersonCode,
39
            ConstructionCode,
40 40
            /// <summary>
41 41
            /// 議事録作成日
42 42
            /// </summary>
43 43
            ProceedingsDataDate,
44 44
            /// <summary>
45
            /// 工事番号
45
            /// 会議時間開始
46 46
            /// </summary>
47
            ConstructionCode,
47
            StartMeetingTime,
48 48
            /// <summary>
49 49
            /// データ行番号
50 50
            /// </summary>
......
60 60
            /// <summary>
61 61
            /// 内容
62 62
            /// </summary>
63
            Contents,
63
            ContentsText,
64 64
            /// <summary>
65 65
            /// 登録年月日
66 66
            /// </summary>
......
93 93
            // SQL作成(oracleのDateTime型が変換できないのでCharに変換しておく)
94 94
            string strcmd = "SELECT";
95 95

  
96
            strcmd += "  PersonCode";                                       // 担当者コード
96
            strcmd += " ConstructionCode";                                  // 工事番号
97 97
            strcmd += " ,TO_CHAR(ProceedingsDataDate, 'YYYY/MM/DD')";       // 議事録作成日
98
            strcmd += " ,ConstructionCode";                                 // 工事番号
98
            strcmd += " ,StartMeetingTime";                                 // 会議時間開始
99 99
            strcmd += " ,SeqNo";                                            // データ行番号
100
            strcmd += " ,TitileNo";                                         // 議題番号
101
            strcmd += " ,Titile";                                           // 議題
102
            strcmd += " ,Contents";                                         // 内容
100
            strcmd += " ,TitleNo";                                          // 議題番号
101
            strcmd += " ,Title";                                            // 議題
102
            strcmd += " ,ContentsText";                                     // 内容
103 103
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";      // 登録年月日
104 104
            strcmd += ", TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";     // 更新年月日
105 105
            strcmd += " FROM ProceedingsDataDetail";
......
186 186
            {
187 187
                strcmd = "INSERT INTO ProceedingsDataDetail";
188 188

  
189
                strcmd += " VALUES (";
189
                strcmd += " (";
190
                bool bFirst = true;
191
                foreach (var gender in Enum.GetValues(typeof(DataColumn)))
192
                {
193
                    if (!bFirst) strcmd += " ,";
194
                    strcmd += gender.ToString();
195
                    bFirst = false;
196
                }
197
                strcmd += ") VALUES (";
190 198

  
191
                strcmd += string.Format("  {0}", work.PersonCode);                          // 担当者コード
199
                strcmd += string.Format(" {0}", work.ConstructionCode);                     // 工事番号
192 200
                strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')"
193
                                            , work.ProceedingsDataDate.ToShortDateString());      // 議事録作成日
194
                strcmd += string.Format(", {0}", work.ConstructionCode);                    // 工事番号
201
                                            , work.ProceedingsDataDate.ToShortDateString());// 議事録作成日
202
                strcmd += string.Format(", {0}", work.StartMeetingTime);                    // 会議時間開始
195 203
                strcmd += string.Format(", {0}", work.SeqNo);                               // データ行番号
196 204

  
197
                strcmd += string.Format(", {0}", work.TitleNo);                            // 議題番号
198
                strcmd += string.Format(",'{0}'", work.Title);                             // 議題
199
                strcmd += string.Format(",'{0}'", work.Contents);                           // 内容
205
                strcmd += string.Format(",'{0}'", work.TitleNo);                            // 議題番号
206
                strcmd += string.Format(",'{0}'", work.Title);                              // 議題
207
                strcmd += string.Format(",'{0}'", work.ContentsText);                       // 内容
200 208

  
201 209
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
202 210
                strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
252 260

  
253 261
                strcmd += " SET";
254 262

  
255
                strcmd += string.Format(" PersonCode = {0}", data.PersonCode);                  // 担当者コード
263
                strcmd += string.Format(" ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
256 264
                strcmd += string.Format(",ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')"
257
                                        , data.ProceedingsDataDate.ToShortDateString());              // 議事録作成日
258
                strcmd += string.Format(",ConstructionCode = {0}", data.ConstructionCode);      // 工事番号
265
                                        , data.ProceedingsDataDate.ToShortDateString());        // 議事録作成日
266
                strcmd += string.Format(",StartMeetingTime = {0}", data.StartMeetingTime);      // 会議時間開始
259 267
                strcmd += string.Format(",SeqNo = {0}", data.SeqNo);                            // データ行番号
260 268

  
261
                strcmd += string.Format(",TitileNo = {0}", data.TitleNo);                       // 議題番号
262
                strcmd += string.Format(",Titile = '{0}'", data.Title);                         // 議題
263
                strcmd += string.Format(",Contents = '{0}'", data.Contents);                    // 内容
269
                strcmd += string.Format(",TitleNo = '{0}'", data.TitleNo);                      // 議題番号
270
                strcmd += string.Format(",Title = '{0}'", data.Title);                          // 議題
271
                strcmd += string.Format(",ContentsText = '{0}'", data.ContentsText);            // 内容
264 272

  
265 273
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
266 274
                strcmd += AddSQLString;
......
315 323
            try
316 324
            {
317 325
                // データ取得
318
                wrk.PersonCode = int.Parse(objwrk[(int)DataColumn.PersonCode].ToString());                  // 担当者コード
319
                wrk.ProceedingsDataDate = DateTime.Parse(objwrk[(int)DataColumn.ProceedingsDataDate].ToString());       // 議事録作成日
320 326
                wrk.ConstructionCode = int.Parse(objwrk[(int)DataColumn.ConstructionCode].ToString());      // 工事番号
327
                
328
                wrk.ProceedingsDataDate = DateTime.Parse(objwrk[(int)DataColumn.ProceedingsDataDate].ToString());   // 議事録作成日
329

  
330
                wrk.StartMeetingTime = int.Parse(objwrk[(int)DataColumn.StartMeetingTime].ToString());      // 会議時間開始
321 331
                wrk.SeqNo = int.Parse(objwrk[(int)DataColumn.SeqNo].ToString());                            // データ行番号
322 332

  
323
                wrk.TitleNo = int.Parse(objwrk[(int)DataColumn.TitleNo].ToString());                        // 議題番号
333
                wrk.TitleNo = objwrk[(int)DataColumn.TitleNo].ToString();                                   // 議題番号
324 334
                wrk.Title = objwrk[(int)DataColumn.Title].ToString();                                       // 議題
325
                wrk.Contents = objwrk[(int)DataColumn.Contents].ToString();                                 // 内容
335
                wrk.ContentsText = objwrk[(int)DataColumn.ContentsText].ToString();                         // 内容
326 336

  
327 337
                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
328 338
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
......
347 357
        /// <param name="DataType"></param>
348 358
        /// <param name="DataAddCount"></param>
349 359
        /// <returns></returns>
350
        public string CreatePrimarykeyString(int PersonCode, DateTime ProceedingsDataDate, int ConstructionCode)
360
        public string CreatePrimarykeyString(int ConstructionCode, DateTime ProceedingsDataDate, int StartMeetingTime = 0, int SeqNo = 0)
351 361
        {
352 362
            string strWork = "";
353 363
            try
354 364
            {
355
                strWork = string.Format(" WHERE PersonCode = {0}", PersonCode);
356
                if (ConstructionCode != 0)
357
                    strWork += string.Format(" AND ConstructionCode = {0}", ConstructionCode);
365
                strWork = string.Format(" WHERE ConstructionCode = {0}", ConstructionCode);
358 366
                if (ProceedingsDataDate != DateTime.MinValue)
359 367
                    strWork += string.Format(" AND ProceedingsDataDate = TO_DATE('{0}','YYYY/MM/DD')", ProceedingsDataDate.ToShortDateString());
368
                if (StartMeetingTime != 0)
369
                    strWork += string.Format(" AND StartMeetingTime = {0}", StartMeetingTime);
370
                if (SeqNo != 0)
371
                    strWork += string.Format(" AND SeqNo = {0}", SeqNo);
360 372
            }
361 373
            catch (Exception ex)
362 374
            {
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApprovalCommnet.cs
18 18
    /// <summary>
19 19
    /// 承認コメントデータアクセスクラス
20 20
    /// </summary>
21
    public class IOProcessApprovalCommnet : OracleProcess
21
    public class IOProcessApprovalComment : OracleProcess
22 22
    {
23 23
        #region 定義部
24 24
        /// <summary>
......
49 49
        /// コンストラクタ
50 50
        /// </summary>
51 51
        /// <param name="ConnectionString"></param>
52
        public IOProcessApprovalCommnet()
52
        public IOProcessApprovalComment()
53 53
            : base(DBCommon.Instance.DBConnectString)
54 54
        {
55 55
        }
......
75 75
            strcmd += ",ApproValComment";
76 76
            strcmd += ",TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";
77 77
            strcmd += ",TO_CHAR(UpdateDate, 'YYYY/MM/DD HH24:MI:ss')";
78
            strcmd += " FROM ProcessApprovalCommnet";
78
            strcmd += " FROM ProcessApprovalComment";
79 79

  
80 80
            return strcmd;
81 81
        }
......
89 89
        /// <param name="data"></param>
90 90
        /// <param name="bConnect"></param>
91 91
        /// <returns></returns>
92
        public bool SelectAction(string AddSQLString, ref List<ProcessApprovalCommnet> data, bool bConnect = true)
92
        public bool SelectAction(string AddSQLString, ref List<ProcessApprovalComment> data, bool bConnect = true)
93 93
        {
94 94
            //Oracle インターフェース
95 95
            string strcmd = "";
......
106 106
                // データセット
107 107
                foreach (object[] objwrk in arData)
108 108
                {
109
                    ProcessApprovalCommnet work = new ProcessApprovalCommnet();
109
                    ProcessApprovalComment work = new ProcessApprovalComment();
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

他の形式にエクスポート: Unified diff