개정판 62e3647c
issue #0000
id2 작업자 입력/수정 가능하도록 변경
document model equals 변경
Change-Id: I4e950f4feba678c8b2c35f4323341323242134e6
| ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
|---|---|---|
| 393 | 393 |
,SubSystemCode=@SubSystemCode |
| 394 | 394 |
,JobLevel=@JobLevel |
| 395 | 395 |
,PersonInCharge=@PersonInCharge |
| 396 |
,Worker=@Worker |
|
| 396 | 397 |
,ModifiedDate=getdate() |
| 397 | 398 |
,ModifiedUser=@ModifiedUser |
| 398 | 399 |
,ToIsDiscussion=@ToIsDiscussion |
| ... | ... | |
| 450 | 451 |
,RefProjectCode |
| 451 | 452 |
,JobLevel |
| 452 | 453 |
,PersonInCharge |
| 454 |
,Worker |
|
| 453 | 455 |
,RegisteredDate |
| 454 | 456 |
,RegisteredUser |
| 455 | 457 |
,ToIsDiscussion |
| ... | ... | |
| 494 | 496 |
,@RefProjectCode |
| 495 | 497 |
,@JobLevel |
| 496 | 498 |
,@PersonInCharge |
| 499 |
,@Worker |
|
| 497 | 500 |
,getdate() |
| 498 | 501 |
,@RegisteredUser |
| 499 | 502 |
,@ToIsDiscussion |
| ... | ... | |
| 548 | 551 |
,SubSystemCode=@SubSystemCode |
| 549 | 552 |
,JobLevel=@JobLevel |
| 550 | 553 |
,PersonInCharge=@PersonInCharge |
| 554 |
,Worker=@Worker |
|
| 551 | 555 |
,ModifiedDate=getdate() |
| 552 | 556 |
,ModifiedUser=@ModifiedUser |
| 553 | 557 |
,ToIsDiscussion=@ToIsDiscussion |
| ... | ... | |
| 667 | 671 |
parameters.Add("ID2StartDate", doc.ID2StartDate);
|
| 668 | 672 |
} |
| 669 | 673 |
|
| 670 |
if (doc.Worker != null)
|
|
| 674 |
if (!string.IsNullOrEmpty(doc.Worker))
|
|
| 671 | 675 |
{
|
| 672 | 676 |
sbSet.Append(" ,Worker=@Worker ");
|
| 673 | 677 |
parameters.Add("Worker", doc.Worker);
|
| ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
|---|---|---|
| 259 | 259 |
|
| 260 | 260 |
public bool Equals(Documents other) |
| 261 | 261 |
{
|
| 262 |
bool isAttfilesEqual = false; |
|
| 263 | 262 |
|
| 264 | 263 |
if (this != null && other == null) |
| 265 | 264 |
return false; |
| 266 | 265 |
|
| 267 |
if (this.AttFiles == null && other.AttFiles == null) |
|
| 268 |
{
|
|
| 269 |
isAttfilesEqual = true; |
|
| 270 |
} |
|
| 266 |
if ( this.DocumentNo != other.DocumentNo ) return false; |
|
| 267 |
if ( this.RevisonNo != other.RevisonNo ) return false; |
|
| 268 |
if ( this.System != other.System ) return false; |
|
| 269 |
if ( this.SubSystemCode != other.SubSystemCode ) return false; |
|
| 270 |
if ( this.RefProjectCode != other.RefProjectCode ) return false; |
|
| 271 |
if ( this.JobLevel != other.JobLevel ) return false; |
|
| 272 |
if ( this.PersonInCharge != other.PersonInCharge ) return false; |
|
| 273 |
if ( this.Worker != other.Worker ) return false; |
|
| 274 |
if ( this.ToIsDiscussion != other.ToIsDiscussion ) return false; |
|
| 275 |
if ( this.ToRemarks != other.ToRemarks ) return false; |
|
| 276 |
if ( this.ToCreator != other.ToCreator ) return false; |
|
| 277 |
|
|
| 278 |
if ( this.FrReviewStatus != other.FrReviewStatus ) return false; |
|
| 279 |
if ( this.FrRemarks != other.FrRemarks ) return false; |
|
| 280 |
if ( this.FrCreator != other.FrCreator ) return false; |
|
| 281 |
if ( this.ID2StartDate != other.ID2StartDate ) return false; |
|
| 282 |
if ( this.ID2EndDate != other.ID2EndDate ) return false; |
|
| 283 |
if ( this.ID2Status != other.ID2Status ) return false; |
|
| 284 |
if ( this.ID2Issues != other.ID2Issues ) return false; |
|
| 285 |
if ( this.ReplyModifications != other.ReplyModifications ) return false; |
|
| 286 |
if ( this.ReplyRequester != other.ReplyRequester ) return false; |
|
| 287 |
if ( this.IsConvert != other.IsConvert ) return false; |
|
| 288 |
if ( this.AVEVAPersonInCharge != other.AVEVAPersonInCharge) return false; |
|
| 289 |
if ( this.AVEVAWorker != other.AVEVAWorker ) return false; |
|
| 290 |
if ( this.AVEVAConvertDate != other.AVEVAConvertDate ) return false; |
|
| 291 |
if ( this.AVEVAReviewDate != other.AVEVAReviewDate ) return false; |
|
| 292 |
if ( this.AVEVAWorkDate != other.AVEVAWorkDate ) return false; |
|
| 293 |
if ( this.AVEVAStatus != other.AVEVAStatus ) return false; |
|
| 294 |
if ( this.AVEVAIssues != other.AVEVAIssues ) return false; |
|
| 295 |
if ( this.ProdReviewer != other.ProdReviewer ) return false; |
|
| 296 |
if ( this.ProdIsResult != other.ProdIsResult ) return false; |
|
| 297 |
if ( this.ProdRemarks != other.ProdRemarks ) return false; |
|
| 298 |
if ( this.ClientReviewer != other.ClientReviewer ) return false; |
|
| 299 |
if ( this.ClientIsResult != other.ClientIsResult ) return false; |
|
| 300 |
if ( this.ClientRemarks != other.ClientRemarks ) return false; |
|
| 301 |
if ( this.DTIsGateWay != other.DTIsGateWay ) return false; |
|
| 302 |
if ( this.DTIsImport != other.DTIsImport ) return false; |
|
| 303 |
if ( this.DTIsRegSystem != other.DTIsRegSystem ) return false; |
|
| 304 |
if ( this.DTRemarks != other.DTRemarks ) return false; |
|
| 305 |
if ( this.ConvertStatus != other.ConvertStatus ) return false; |
|
| 271 | 306 |
|
| 272 |
if (isAttfilesEqual)
|
|
| 307 |
if (this.AttFiles == null && other.AttFiles == null)
|
|
| 273 | 308 |
{
|
| 274 |
if (this.DocumentNo != other.DocumentNo) |
|
| 275 |
return false; |
|
| 276 |
|
|
| 277 |
if (this.RevisonNo != other.RevisonNo) |
|
| 278 |
return false; |
|
| 279 |
|
|
| 280 |
if (this.System != other.System) |
|
| 281 |
return false; |
|
| 282 |
|
|
| 283 |
if (this.SubSystemCode != other.SubSystemCode) |
|
| 284 |
return false; |
|
| 285 |
|
|
| 286 |
if (this.RefProjectCode != other.RefProjectCode) |
|
| 287 |
return false; |
|
| 288 |
|
|
| 289 |
if (this.JobLevel != other.JobLevel) |
|
| 290 |
return false; |
|
| 291 |
|
|
| 292 |
if (this.PersonInCharge != other.PersonInCharge) |
|
| 293 |
return false; |
|
| 294 |
|
|
| 295 |
if (this.ToIsDiscussion != other.ToIsDiscussion) |
|
| 296 |
return false; |
|
| 297 |
|
|
| 298 |
if (this.ToRemarks != other.ToRemarks) |
|
| 299 |
return false; |
|
| 300 |
|
|
| 301 |
if (this.ToCreator != other.ToCreator) |
|
| 302 |
return false; |
|
| 303 |
|
|
| 304 |
if (this.FrReviewStatus != other.FrReviewStatus) return false; |
|
| 305 |
if ( this.FrRemarks != other.FrRemarks ) return false; |
|
| 306 |
if ( this.FrCreator != other.FrCreator ) return false; |
|
| 307 |
if ( this.ID2StartDate != other.ID2StartDate ) return false; |
|
| 308 |
if ( this.ID2EndDate != other.ID2EndDate ) return false; |
|
| 309 |
if ( this.ID2Status != other.ID2Status ) return false; |
|
| 310 |
if ( this.ID2Issues != other.ID2Issues ) return false; |
|
| 311 |
if ( this.ReplyModifications != other.ReplyModifications ) return false; |
|
| 312 |
if ( this.ReplyRequester != other.ReplyRequester ) return false; |
|
| 313 |
if ( this.IsConvert != other.IsConvert ) return false; |
|
| 314 |
if ( this.AVEVAPersonInCharge != other.AVEVAPersonInCharge ) return false; |
|
| 315 |
if ( this.AVEVAWorker != other.AVEVAWorker ) return false; |
|
| 316 |
if ( this.AVEVAConvertDate != other.AVEVAConvertDate ) return false; |
|
| 317 |
if ( this.AVEVAReviewDate != other.AVEVAReviewDate ) return false; |
|
| 318 |
if ( this.AVEVAWorkDate != other.AVEVAWorkDate ) return false; |
|
| 319 |
if ( this.AVEVAStatus != other.AVEVAStatus ) return false; |
|
| 320 |
if ( this.AVEVAIssues != other.AVEVAIssues ) return false; |
|
| 321 |
if ( this.ProdReviewer != other.ProdReviewer ) return false; |
|
| 322 |
if ( this.ProdIsResult != other.ProdIsResult ) return false; |
|
| 323 |
if ( this.ProdRemarks != other.ProdRemarks ) return false; |
|
| 324 |
if ( this.ClientReviewer != other.ClientReviewer ) return false; |
|
| 325 |
if ( this.ClientIsResult != other.ClientIsResult ) return false; |
|
| 326 |
if ( this.ClientRemarks != other.ClientRemarks ) return false; |
|
| 327 |
if ( this.DTIsGateWay != other.DTIsGateWay ) return false; |
|
| 328 |
if ( this.DTIsImport != other.DTIsImport ) return false; |
|
| 329 |
if ( this.DTIsRegSystem != other.DTIsRegSystem ) return false; |
|
| 330 |
if ( this.DTRemarks != other.DTRemarks ) return false; |
|
| 331 |
if ( this.ConvertStatus != other.ConvertStatus) return false; |
|
| 309 |
return true; |
|
| 332 | 310 |
} |
| 333 | 311 |
else if (this.AttFiles != null && other.AttFiles != null) |
| 334 | 312 |
{
|
| 335 | 313 |
if (!this.AttFiles.SequenceEqual(other.AttFiles)) |
| 336 | 314 |
return false; |
| 337 | 315 |
} |
| 316 |
else |
|
| 317 |
{
|
|
| 318 |
return false; |
|
| 319 |
} |
|
| 338 | 320 |
|
| 339 | 321 |
//bool result = this.FrReviewStatus == other.FrReviewStatus && this.FrRemarks == other.FrRemarks && this.FrCreator == other.FrCreator |
| 340 | 322 |
// && this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2Status == other.ID2Status |
| ... | ... | |
| 358 | 340 |
{
|
| 359 | 341 |
return this.DocumentNo.GetNullableHash() + this.RevisonNo.GetNullableHash() + this.System.GetNullableHash() + this.SubSystemCode.GetNullableHash() |
| 360 | 342 |
+ this.RefProjectCode.GetNullableHash() + this.JobLevel.GetNullableHash() |
| 361 |
+ this.PersonInCharge.GetNullableHash() + this.ToIsDiscussion.GetNullableHash() + this.ToRemarks.GetNullableHash() |
|
| 343 |
+ this.PersonInCharge.GetNullableHash() + this.Worker.GetNullableHash() + this.ToIsDiscussion.GetNullableHash() + this.ToRemarks.GetNullableHash()
|
|
| 362 | 344 |
+ this.ToCreator.GetNullableHash() |
| 363 | 345 |
+ this.FrReviewStatus.GetNullableHash() + this.FrRemarks.GetNullableHash() + this.FrCreator.GetNullableHash() |
| 364 | 346 |
+ this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2Status.GetNullableHash() |
| ... | ... | |
| 419 | 401 |
this.RefProjectCode = docData.RefProjectCode; |
| 420 | 402 |
this.JobLevel = docData.JobLevel; |
| 421 | 403 |
this.PersonInCharge = docData.PersonInCharge; |
| 404 |
this.Worker = docData.Worker; |
|
| 422 | 405 |
this.ToIsDiscussion = docData.ToIsDiscussion; |
| 423 | 406 |
this.ToRemarks = docData.ToRemarks; |
| 424 | 407 |
this.ToCreator = docData.ToCreator; |
| ID2.Manager/ID2.Manager/Main.Designer.cs | ||
|---|---|---|
| 747 | 747 |
gridViewComboBoxColumn3.FieldName = "Worker"; |
| 748 | 748 |
gridViewComboBoxColumn3.HeaderText = "작업자(ID2)"; |
| 749 | 749 |
gridViewComboBoxColumn3.Name = "Worker"; |
| 750 |
gridViewComboBoxColumn3.ReadOnly = true; |
|
| 751 | 750 |
gridViewComboBoxColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; |
| 752 | 751 |
gridViewComboBoxColumn3.Width = 100; |
| 753 | 752 |
gridViewComboBoxColumn4.EnableExpressionEditor = false; |
내보내기 Unified diff
