diff --git a/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java index b7136a38..30ba59ca 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java +++ b/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java @@ -13,6 +13,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.*; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.HashSet; @@ -31,22 +32,66 @@ public class UserInfo extends BaseModel implements UserDetails{ @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "user_seq") private Integer userSeq; + @Column(name = "dic_code") + private String dicCode; @Column(name = "user_id") private String userId; @Column(name = "passwd") private String password; @Column(name = "user_nm") private String userNm; - @Column(name = "og_cd") - private String ogCd; - @Column(name = "ofc_cd") - private String ofcCd; + @Column(name = "birth_date") + private LocalDate birthDate; + @Column(name = "sex") + private String sex; + @Column(name = "email") + private String email; + @Column(name = "phone_no") + private String phoneNo; + @Column(name = "area_cd") + private String areaCd; + @Column(name = "login_chk") + private String loginChk; + @Column(name = "fail_cnt") + private Integer failCnt; @Column(name = "user_role") private String userRole; @Column(name = "user_status") private String userStatus; + @Column(name = "og_cd") + private String ogCd; + @Column(name = "ofc_cd") + private String ofcCd; + @Column(name = "title_cd") + private String titleCd; @Column(name = "wrt_dt") private LocalDateTime wrtDt; + @Column(name = "group_cd") + private String groupCd; + @Column(name = "series_cd") + private String seriesCd; + @Column(name = "ofc_head_yn") + private String ofcHeadYn; + @Column(name = "hiring_cd") + private String hiringCd; + @Column(name = "employ_cd") + private String employCd; + @Column(name = "outturn_cd") + private String outturnCd; + @Column(name = "work_cd") + private String workCd; + @Column(name = "job_in_cd") + private String jobInCd; + @Column(name = "language_cd") + private String languageCd; + @Column(name = "police_in_date") + private LocalDate policeInDate; + @Column(name = "organ_in_date") + private LocalDate organInDate; + @Column(name = "ofc_in_date") + private LocalDate ofcInDate; + @Column(name = "title_in_date") + private LocalDate titleInDate; @Transient private String modifyPassword; diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 73e99b2c..b187afe2 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -4,39 +4,41 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + user_status = #{userStatus} + + + user_status != 'D' + + + + and user_id like '%'||#{userId}||'%' + + + and user_nm like '%'||#{userNm}||'%' + + + and og_cd = #{ogCd} + + + and ofc_cd = #{ofcCd} + + + @@ -44,27 +46,7 @@