Produced by Araxis Merge on 12/13/2018 10:35:23 AM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model | Attachment.java | Fri Dec 7 17:36:18 2018 UTC |
| 2 | v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model | Attachment.java | Wed Dec 12 22:33:38 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 156 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /** | |
| 2 | * | |
| 3 | */ | |
| 4 | package go v.va.med.c cht.model; | |
| 5 | ||
| 6 | import jav a.util.Dat e; | |
| 7 | ||
| 8 | import jav ax.persist ence.Colum n; | |
| 9 | import jav ax.persist ence.JoinC olumn; | |
| 10 | import jav ax.persist ence.ManyT oOne; | |
| 11 | import jav ax.persist ence.Mappe dSuperclas s; | |
| 12 | import jav ax.persist ence.Trans ient; | |
| 13 | ||
| 14 | import org .hibernate .annotatio ns.Formula ; | |
| 15 | ||
| 16 | import gov .va.med.cc ht.model.t erminology .DocumentT ype; | |
| 17 | ||
| 18 | /** | |
| 19 | * @author DNS | |
| 20 | * | |
| 21 | */ | |
| 22 | @MappedSup erclass | |
| 23 | public cla ss Attachm ent extend s CCHTAudi tFields { | |
| 24 | ||
| 25 | pr ivate Date date = nu ll; | |
| 26 | pr ivate Docu mentType d ocumentTyp e = null; | |
| 27 | pr ivate Stri ng documen tName = nu ll; | |
| 28 | ||
| 29 | pr ivate Stri ng submitt edByName = null; | |
| 30 | ||
| 31 | pu blic Attac hment() { | |
| 32 | } | |
| 33 | ||
| 34 | pr otected At tachment(D ate date, DocumentTy pe documen tType, Str ing docume ntName) { | |
| 35 | this .date = da te; | |
| 36 | this .documentT ype = docu mentType; | |
| 37 | this .documentN ame = docu mentName; | |
| 38 | } | |
| 39 | ||
| 40 | @C olumn(name ="ATTACHED _DATE") | |
| 41 | pu blic Date getDate() { | |
| 42 | retu rn date; | |
| 43 | } | |
| 44 | ||
| 45 | pu blic void setDate(Da te date) { | |
| 46 | this .date = da te; | |
| 47 | } | |
| 48 | ||
| 49 | @M anyToOne | |
| 50 | @J oinColumn( name="DOCU MENT_TYPE_ ID") | |
| 51 | pu blic Docum entType ge tDocumentT ype() { | |
| 52 | retu rn documen tType; | |
| 53 | } | |
| 54 | ||
| 55 | pu blic void setDocumen tType(Docu mentType d ocumentTyp e) { | |
| 56 | this .documentT ype = docu mentType; | |
| 57 | } | |
| 58 | ||
| 59 | @C olumn(name ="DOCUMENT _NAME") | |
| 60 | pu blic Strin g getDocum entName() { | |
| 61 | retu rn documen tName; | |
| 62 | } | |
| 63 | ||
| 64 | pu blic void setDocumen tName(Stri ng documen tName) { | |
| 65 | this .documentN ame = docu mentName; | |
| 66 | } | |
| 67 | ||
| 68 | // Commented out for n ow as @For mula can t hrow a Nul lPointerEx ception du e to a doc umented bu g in Hiber nate. | |
| 69 | // Possible work-aroun d is to us e SqlResul tSetMappin g | |
| 70 | // @Formula(v alue = "(s elect isnu ll(u.last_ name,'') + ', ' + is null(u.fir st_name,'' )+' ' + is null(u.mid dle_name,' ') from ht .app_user u where u. user_name = RECORD_C REATED_BY) ") | |
| 71 | @T ransient | |
| 72 | pu blic Strin g getSubmi ttedByName () { | |
| 73 | retu rn submitt edByName; | |
| 74 | } | |
| 75 | ||
| 76 | pu blic void setSubmitt edByName(S tring subm ittedByNam e) { | |
| 77 | this .submitted ByName = s ubmittedBy Name; | |
| 78 | } | |
| 79 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.