DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

인사시스템 연동 부분 주석처리

강석 최 2022-12-06 10:24:47 +09:00
parent 97ca230737
commit 3736e78288
12 changed files with 388 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java
View File

@ -15,45 +15,45 @@ import org.springframework.transaction.PlatformTransactionManager;
import javax.sql.DataSource;
import java.util.HashMap;
@Configuration
@EnableJpaRepositories(
basePackages = "com.dbnt.faisp.kwms.repository",
entityManagerFactoryRef = "kwmsEntityManager",
transactionManagerRef = "kwmsTransactionManager"
)
//@Configuration
//@EnableJpaRepositories(
// basePackages = "com.dbnt.faisp.kwms.repository",
// entityManagerFactoryRef = "kwmsEntityManager",
// transactionManagerRef = "kwmsTransactionManager"
//)
public class KwmsDatabaseConfig {
@Autowired
private Environment env;
@Bean
public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(kwmsDataSource());
//Entity 패키지 경로
em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" });
HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
//Hibernate 설정
HashMap<String, Object> properties = new HashMap<>();
properties.put("hibernate.hbm2ddl.auto", "none");
properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
em.setJpaPropertyMap(properties);
return em;
}
@Bean
@ConfigurationProperties(prefix="spring.datasource-kwms")
public DataSource kwmsDataSource() {
return DataSourceBuilder.create().build();
}
@Bean
public PlatformTransactionManager kwmsTransactionManager() {
JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject());
return transactionManager;
}
// @Autowired
// private Environment env;
//
// @Bean
// public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){
// LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
// em.setDataSource(kwmsDataSource());
//
// //Entity 패키지 경로
// em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" });
//
// HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
// em.setJpaVendorAdapter(vendorAdapter);
//
// //Hibernate 설정
// HashMap<String, Object> properties = new HashMap<>();
// properties.put("hibernate.hbm2ddl.auto", "none");
// properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
// em.setJpaPropertyMap(properties);
// return em;
// }
//
// @Bean
// @ConfigurationProperties(prefix="spring.datasource-kwms")
// public DataSource kwmsDataSource() {
// return DataSourceBuilder.create().build();
// }
//
// @Bean
// public PlatformTransactionManager kwmsTransactionManager() {
// JpaTransactionManager transactionManager = new JpaTransactionManager();
// transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject());
// return transactionManager;
// }
}

97
src/main/java/com/dbnt/faisp/kwms/KwmsController.java
View File

@ -23,62 +23,63 @@ public class KwmsController {
@GetMapping("/getEmpInfoToJoinForm")
public ModelAndView getEmpInfo(VEmployee empInfo){
ModelAndView mav = new ModelAndView("login/joinForm");
if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){
UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode());
if(userInfo==null){
mav.addObject("joinFlag", "F");
mav.addObject("userInfo", empInfo);
mav.addObject("msg", "검색 결과가 없습니다.");
}else{
// if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){
// UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode());
// if(userInfo==null){
// mav.addObject("joinFlag", "F");
// mav.addObject("userInfo", empInfo);
// mav.addObject("msg", "검색 결과가 없습니다.");
// }else{
mav.addObject("joinFlag", "T");
mav.addObject("userInfo", userInfo);
// mav.addObject("userInfo", userInfo);
mav.addObject("userInfo", new UserInfo());
mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
}
}else{
mav.addObject("joinFlag", "F");
mav.addObject("userInfo", empInfo);
mav.addObject("msg", "이미 가입된 식별번호입니다.");
}
// }
// }else{
// mav.addObject("joinFlag", "F");
// mav.addObject("userInfo", empInfo);
// mav.addObject("msg", "이미 가입된 식별번호입니다.");
// }
return mav;
}
@GetMapping("/updateUserInfoToKwms")
public ModelAndView updateUserInfoToKwms(VEmployee empInfo){
ModelAndView mav = new ModelAndView("login/joinForm");
if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){
UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode());
if(userInfo==null){
mav.addObject("joinFlag", "F");
mav.addObject("userInfo", empInfo);
mav.addObject("msg", "검색 결과가 없습니다.");
}else{
mav.addObject("joinFlag", "T");
mav.addObject("userInfo", userInfo);
mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
}
}else{
mav.addObject("joinFlag", "F");
mav.addObject("userInfo", empInfo);
mav.addObject("msg", "이미 가입된 식별번호입니다.");
}
return mav;
}
@GetMapping("/kwmsCareerModal")
public ModelAndView kwmsCareerModal(Integer userSeq, String dicCode){
ModelAndView mav = new ModelAndView("faisp/career/kwmsCareerModal");
mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC"));
mav.addObject("careerList", kwmsService.selectUserCareerList(userSeq, dicCode));
return mav;
}
// @GetMapping("/updateUserInfoToKwms")
// public ModelAndView updateUserInfoToKwms(VEmployee empInfo){
// ModelAndView mav = new ModelAndView("login/joinForm");
// if(userInfoService.selectUserInfoToDicCode(empInfo.getDicCode()) == null){
// UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDicCode());
// if(userInfo==null){
// mav.addObject("joinFlag", "F");
// mav.addObject("userInfo", empInfo);
// mav.addObject("msg", "검색 결과가 없습니다.");
// }else{
// mav.addObject("joinFlag", "T");
// mav.addObject("userInfo", userInfo);
// mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
// mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
// mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
// mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
// mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
// mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
// }
// }else{
// mav.addObject("joinFlag", "F");
// mav.addObject("userInfo", empInfo);
// mav.addObject("msg", "이미 가입된 식별번호입니다.");
// }
// return mav;
// }
//
// @GetMapping("/kwmsCareerModal")
// public ModelAndView kwmsCareerModal(Integer userSeq, String dicCode){
// ModelAndView mav = new ModelAndView("faisp/career/kwmsCareerModal");
// mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC"));
// mav.addObject("careerList", kwmsService.selectUserCareerList(userSeq, dicCode));
// return mav;
// }
}

52
src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java
View File

@ -13,32 +13,32 @@ import javax.persistence.*;
@Setter
@Entity
@NoArgsConstructor
@DynamicInsert
@DynamicUpdate
@Table(name = "V_EMPLOYEE")
//@DynamicInsert
//@DynamicUpdate
//@Table(name = "V_EMPLOYEE")
public class VEmployee {
@Id
@Column(name = "DIC_CODE")
private String dicCode;
@Column(name = "EMP_NM")
private String empNm;
@Column(name = "BIRTH_DATE")
private String birthDate;
@Column(name = "SEX")
private String sex;
@Column(name = "POLICE_BMNG_IL")
private String policeBmngIl;
@Column(name = "JIKGEUP")
private String jikgeup;
@Column(name = "HN_JIKGEUP_IMYNGIL")
private String hnJikgeupImyngil;
@Column(name = "CALL_BUSEO_NM")
private String callBuseoNm;
@Column(name = "SAYONG_YN")
private String sayongYn;
@Column(name = "GYUNGGWA")
private String gyunggwa;
@Column(name = "JIKBYUL")
private String jikbyul;
// @Id
// @Column(name = "DIC_CODE")
// private String dicCode;
// @Column(name = "EMP_NM")
// private String empNm;
// @Column(name = "BIRTH_DATE")
// private String birthDate;
// @Column(name = "SEX")
// private String sex;
// @Column(name = "POLICE_BMNG_IL")
// private String policeBmngIl;
// @Column(name = "JIKGEUP")
// private String jikgeup;
// @Column(name = "HN_JIKGEUP_IMYNGIL")
// private String hnJikgeupImyngil;
// @Column(name = "CALL_BUSEO_NM")
// private String callBuseoNm;
// @Column(name = "SAYONG_YN")
// private String sayongYn;
// @Column(name = "GYUNGGWA")
// private String gyunggwa;
// @Column(name = "JIKBYUL")
// private String jikbyul;
}

64
src/main/java/com/dbnt/faisp/kwms/model/VHordYundongStat.java
View File

@ -17,38 +17,38 @@ import java.time.LocalDateTime;
@Setter
@Entity
@NoArgsConstructor
@DynamicInsert
@DynamicUpdate
@Table(name = "V_HORD_YUNDONG_STAT")
//@DynamicInsert
//@DynamicUpdate
//@Table(name = "V_HORD_YUNDONG_STAT")
public class VHordYundongStat {
@Id
@Column(name = "HORD_YUNDONG_CD")
private String hordYundongCd;
@Column(name = "DIC_CODE")
private String dicCode;
@Column(name = "IMYONG_GUBUN_CD")
private String imyongGubunCd;
@Column(name = "IMYONG_GUBUN_NM")
private String imyongGubunNm;
@Column(name = "BUSEO_CD")
private String buseoCd;
@Column(name = "JIKGEUP_CD")
private String jikgeupCd;
@Column(name = "START_DATE")
private LocalDate startDate;
@Column(name = "END_DATE")
private LocalDate endDate;
@Column(name = "WORK_DAY")
private Integer workDay;
@Column(name = "WORK_MONTH")
private Integer workMonth;
@Column(name = "WORK_MONTH_DESC")
private String workMonthDesc;
@Column(name = "IMYONGBUSEO_CHONGCHING")
private String imyongbuseoChongching;
@Column(name = "IMYONG_JIKGEUP_NM")
private String imyongJikgeupNm;
@Column(name = "SYS_DATE")
private LocalDateTime sysDate;
// @Id
// @Column(name = "HORD_YUNDONG_CD")
// private String hordYundongCd;
// @Column(name = "DIC_CODE")
// private String dicCode;
// @Column(name = "IMYONG_GUBUN_CD")
// private String imyongGubunCd;
// @Column(name = "IMYONG_GUBUN_NM")
// private String imyongGubunNm;
// @Column(name = "BUSEO_CD")
// private String buseoCd;
// @Column(name = "JIKGEUP_CD")
// private String jikgeupCd;
// @Column(name = "START_DATE")
// private LocalDate startDate;
// @Column(name = "END_DATE")
// private LocalDate endDate;
// @Column(name = "WORK_DAY")
// private Integer workDay;
// @Column(name = "WORK_MONTH")
// private Integer workMonth;
// @Column(name = "WORK_MONTH_DESC")
// private String workMonthDesc;
// @Column(name = "IMYONGBUSEO_CHONGCHING")
// private String imyongbuseoChongching;
// @Column(name = "IMYONG_JIKGEUP_NM")
// private String imyongJikgeupNm;
// @Column(name = "SYS_DATE")
// private LocalDateTime sysDate;
}

6
src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java
View File

@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface VEmployeeRepository extends JpaRepository<VEmployee, String> {
Optional<VEmployee> findByDicCode(String dicCode);
//public interface VEmployeeRepository extends JpaRepository<VEmployee, String> {
public interface VEmployeeRepository {
// Optional<VEmployee> findByDicCode(String dicCode);
}

5
src/main/java/com/dbnt/faisp/kwms/repository/VHordYundongStatRepository.java
View File

@ -6,7 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface VHordYundongStatRepository extends JpaRepository<VHordYundongStat, String> {
//public interface VHordYundongStatRepository extends JpaRepository<VHordYundongStat, String> {
public interface VHordYundongStatRepository {
List<VHordYundongStat> findByDicCodeOrderByStartDateDesc(String dicCode);
// List<VHordYundongStat> findByDicCodeOrderByStartDateDesc(String dicCode);
}

128
src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
View File

@ -20,68 +20,68 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class KwmsService {
private final VEmployeeRepository vEmployeeRepository;
private final VHordYundongStatRepository vHordRepository;
private final CodeMgtService codeMgtService;
private final UserCareerRepository careerRepository;
public UserInfo selectEmpInfo(String dicCode){
VEmployee empInfo = vEmployeeRepository.findByDicCode(dicCode).orElse(null);
if(empInfo==null){
return null;
}else{
return convertVEmployeeToUserInfo(empInfo);
}
}
private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){
UserInfo userInfo = new UserInfo();
userInfo.setDicCode(empInfo.getDicCode());
userInfo.setUserNm(empInfo.getEmpNm());
userInfo.setSex(empInfo.getSex().strip().equals("F")?"SEX001":"SEX002");
String[] positionAry = empInfo.getCallBuseoNm().split(" ");
userInfo.setOgCd(codeMgtService.searchCodeToCategoryAndValue("OG", positionAry[0]));
if (positionAry.length>1){
userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue("OFC", positionAry[1]));
}
userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgeup()));
userInfo.setOutturnCd(codeMgtService.searchCodeToCategoryAndValue("OTC", empInfo.getGyunggwa()));
userInfo.setSeriesCd(codeMgtService.searchCodeToCategoryAndValue("SRC", empInfo.getJikbyul()));
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
empInfo.setBirthDate(
(Integer.parseInt(empInfo.getBirthDate().substring(0,2))>60?"19":"20")+empInfo.getBirthDate());
userInfo.setBirthDate(LocalDate.parse(empInfo.getBirthDate(), formatter));
userInfo.setPoliceInDate(LocalDate.parse(empInfo.getPoliceBmngIl(), formatter));
userInfo.setTitleInDate(LocalDate.parse(empInfo.getHnJikgeupImyngil(), formatter));
return userInfo;
}
public List<UserCareer> selectUserCareerList(Integer userSeq, String dicCode) {
List<VHordYundongStat> statList = vHordRepository.findByDicCodeOrderByStartDateDesc(dicCode);
List<UserCareer> savedList = careerRepository.findByUserSeqOrderByStartDateDesc(userSeq);
List<UserCareer> careerList = new ArrayList<>();
for(VHordYundongStat stat: statList){
boolean savedFlag = false;
for(UserCareer savedCareer: savedList){
if (stat.getHordYundongCd().equals(savedCareer.getHordCd())) {
savedFlag = true;
break;
}
}
if(!savedFlag){
UserCareer career = new UserCareer();
career.setDesignationCd(codeMgtService.searchCodeToCategoryAndValue("DSN", stat.getImyongGubunNm()));
career.setWorkPositionStr(stat.getImyongbuseoChongching());
career.setWorkTitle(codeMgtService.searchCodeToCategoryAndValue("JT", stat.getImyongJikgeupNm()));
career.setStartDate(stat.getStartDate());
career.setEndDate(stat.getEndDate());
career.setWorkDay(stat.getWorkDay()==null?0:stat.getWorkDay());
career.setWorkMonth(stat.getWorkMonth()==null?0:stat.getWorkMonth());
career.setHordCd(stat.getHordYundongCd());
careerList.add(career);
}
}
return careerList;
}
// private final VEmployeeRepository vEmployeeRepository;
// private final VHordYundongStatRepository vHordRepository;
// private final CodeMgtService codeMgtService;
// private final UserCareerRepository careerRepository;
//
// public UserInfo selectEmpInfo(String dicCode){
// VEmployee empInfo = vEmployeeRepository.findByDicCode(dicCode).orElse(null);
// if(empInfo==null){
// return null;
// }else{
// return convertVEmployeeToUserInfo(empInfo);
// }
// }
//
// private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){
// UserInfo userInfo = new UserInfo();
// userInfo.setDicCode(empInfo.getDicCode());
// userInfo.setUserNm(empInfo.getEmpNm());
// userInfo.setSex(empInfo.getSex().strip().equals("F")?"SEX001":"SEX002");
// String[] positionAry = empInfo.getCallBuseoNm().split(" ");
// userInfo.setOgCd(codeMgtService.searchCodeToCategoryAndValue("OG", positionAry[0]));
// if (positionAry.length>1){
// userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue("OFC", positionAry[1]));
// }
// userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgeup()));
// userInfo.setOutturnCd(codeMgtService.searchCodeToCategoryAndValue("OTC", empInfo.getGyunggwa()));
// userInfo.setSeriesCd(codeMgtService.searchCodeToCategoryAndValue("SRC", empInfo.getJikbyul()));
//
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
// empInfo.setBirthDate(
// (Integer.parseInt(empInfo.getBirthDate().substring(0,2))>60?"19":"20")+empInfo.getBirthDate());
// userInfo.setBirthDate(LocalDate.parse(empInfo.getBirthDate(), formatter));
// userInfo.setPoliceInDate(LocalDate.parse(empInfo.getPoliceBmngIl(), formatter));
// userInfo.setTitleInDate(LocalDate.parse(empInfo.getHnJikgeupImyngil(), formatter));
// return userInfo;
// }
//
// public List<UserCareer> selectUserCareerList(Integer userSeq, String dicCode) {
// List<VHordYundongStat> statList = vHordRepository.findByDicCodeOrderByStartDateDesc(dicCode);
// List<UserCareer> savedList = careerRepository.findByUserSeqOrderByStartDateDesc(userSeq);
// List<UserCareer> careerList = new ArrayList<>();
// for(VHordYundongStat stat: statList){
// boolean savedFlag = false;
// for(UserCareer savedCareer: savedList){
// if (stat.getHordYundongCd().equals(savedCareer.getHordCd())) {
// savedFlag = true;
// break;
// }
// }
// if(!savedFlag){
// UserCareer career = new UserCareer();
// career.setDesignationCd(codeMgtService.searchCodeToCategoryAndValue("DSN", stat.getImyongGubunNm()));
// career.setWorkPositionStr(stat.getImyongbuseoChongching());
// career.setWorkTitle(codeMgtService.searchCodeToCategoryAndValue("JT", stat.getImyongJikgeupNm()));
// career.setStartDate(stat.getStartDate());
// career.setEndDate(stat.getEndDate());
// career.setWorkDay(stat.getWorkDay()==null?0:stat.getWorkDay());
// career.setWorkMonth(stat.getWorkMonth()==null?0:stat.getWorkMonth());
// career.setHordCd(stat.getHordYundongCd());
// careerList.add(career);
// }
// }
// return careerList;
// }
}

10
src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java
View File

@ -69,11 +69,11 @@ public class MyInfoController {
@PostMapping("/syncSelfToKwms")
public void syncSelfToKwms(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
UserInfo kwmsInfo = kwmsService.selectEmpInfo(userInfo.getDicCode());
if(kwmsInfo!= null){
kwmsInfo.setUserSeq(loginUser.getUserSeq());
userInfoService.updateUserInfo(loginUser,kwmsInfo);
}
// UserInfo kwmsInfo = kwmsService.selectEmpInfo(userInfo.getDicCode());
// if(kwmsInfo!= null){
// kwmsInfo.setUserSeq(loginUser.getUserSeq());
// userInfoService.updateUserInfo(loginUser,kwmsInfo);
// }
}
@GetMapping("/moveAlarmBoard")
public ModelAndView moveAlarmBoard(UserAlarm alarm){

14
src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
View File

@ -133,13 +133,13 @@ public class PoliceController {
@PostMapping("/syncUserInfoToKwms")
@ResponseBody
public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List<UserInfo> infoList){
for(UserInfo info: infoList){
UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode());
if(kwmsInfo!=null){
kwmsInfo.setUserSeq(info.getUserSeq());
userInfoService.updateUserInfo(loginUser,kwmsInfo);
}
}
// for(UserInfo info: infoList){
// UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode());
// if(kwmsInfo!=null){
// kwmsInfo.setUserSeq(info.getUserSeq());
// userInfoService.updateUserInfo(loginUser,kwmsInfo);
// }
// }
if(infoList.size()==1){
return infoList.get(0).getUserSeq().toString();
}else{

14
src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
View File

@ -90,13 +90,13 @@ public class UserMgtController {
@PostMapping("/syncUserInfoToKwms")
@ResponseBody
public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List<UserInfo> infoList){
for(UserInfo info: infoList){
UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode());
if(kwmsInfo!=null){
kwmsInfo.setUserSeq(info.getUserSeq());
userInfoService.updateUserInfo(loginUser,kwmsInfo);
}
}
// for(UserInfo info: infoList){
// UserInfo kwmsInfo = kwmsService.selectEmpInfo(info.getDicCode());
// if(kwmsInfo!=null){
// kwmsInfo.setUserSeq(info.getUserSeq());
// userInfoService.updateUserInfo(loginUser,kwmsInfo);
// }
// }
if(infoList.size()==1){
return infoList.get(0).getUserSeq().toString();
}else{

10
src/main/resources/static/js/login/login.js
View File

@ -1,6 +1,6 @@
$(document).on('click', '#dicCodeSearchBtn', function (){
const dicCode = $("#dicCode").val();
if(dicCode!==''){
//if(dicCode!==''){
$.ajax({
url: '/kwms/getEmpInfoToJoinForm',
data: {dicCode: dicCode},
@ -15,12 +15,12 @@ $(document).on('click', '#dicCodeSearchBtn', function (){
});
},
error:function(e){
debugger
}
});
}else{
alert("공무원식별번호를 입력해주세요.")
}
//}else{
// alert("공무원식별번호를 입력해주세요.")
//}
})
$(document).on('click', '#saveBtn', function (){

158
src/main/resources/templates/login/joinForm.html
View File

@ -5,7 +5,7 @@
<h5 class="modal-title text-white" id="userInsertModalLabel">사용자 신청</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" th:if="${joinFlag eq 'F'}">
<!-- <div class="modal-body">th:if="${joinFlag eq 'F'}"
<div class="mb-3 mt-3 row">
<label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
<div class="col-sm-3">
@ -14,9 +14,9 @@
</div>
<button type="button" class="btn btn-sm btn-outline-primary col-sm-1" id="dicCodeSearchBtn">검색</button>
</div>
</div>
<div class="modal-body" th:if="${joinFlag eq 'T'}">
<form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
</div>-->
<div class="modal-body"><!-- th:if="${joinFlag eq 'T'}"-->
<!--<form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
<div class="mb-3 mt-3 row">
<label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
<div class="col-sm-3">
@ -79,7 +79,7 @@
<label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="ogCd" name="ogCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${ogList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ogCd}"></option>
</th:block>
@ -94,7 +94,7 @@
<label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="ofcCd" name="ofcCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${ofcList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
</th:block>
@ -109,7 +109,7 @@
<label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">계급</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="titleCd" name="titleCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${titleList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.titleCd}"></option>
</th:block>
@ -124,7 +124,7 @@
<label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="outturnCd" name="outturnCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${outturnList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.outturnCd}"></option>
</th:block>
@ -133,7 +133,7 @@
<label for="seriesCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직별</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="seriesCd" name="seriesCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${seriesList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.seriesCd}"></option>
</th:block>
@ -144,16 +144,152 @@
<label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="languageCd" name="languageCd">
<option value="">--선택--</option>
<option value="">&#45;&#45;선택&#45;&#45;</option>
<th:block th:each="code:${languageList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.groupCd}"></option>
</th:block>
</select>
</div>
</div>
</form>-->
<form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
<div class="mb-3 mt-3 row">
<label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
<div class="col-sm-3">
<input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off">
</div>
<button type="button" class="btn btn-sm btn-outline-primary col-sm-1" id="dicCodeSearchBtn">검색</button>
</div>
<div class="row mb-1">
<label for="userId" class="col-sm-2 col-form-label col-form-label-sm text-center ">아이디</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm" id="userId" name="userId" autocomplete="off">
<label for="userId" style="font-size: 12px">6~20자 사이의 알파벳, 숫자를 입력하세요</label>
</div>
<label for="userNm" class="col-sm-2 col-form-label col-form-label-sm text-center">이름</label>
<div class="col-sm-4">
<input type="text" class=" form-control form-control-sm" id="userNm" name="userNm" autocomplete="off">
</div>
</div>
<div class="row mb-1">
<label for="modalPassword" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호</label>
<div class="col-sm-4">
<input type="password" class="form-control form-control-sm" id="modalPassword" name="password" autocomplete="new-password">
<label for="userId" style="font-size: 12px">8~16자 사이의 알파벳, 숫자, 특수문자 조합</label>
</div>
<label for="passwordConfirm" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호 확인</label>
<div class="col-sm-4">
<input type="password" class="form-control form-control-sm" id="passwordConfirm">
</div>
</div>
<div class="row mb-1">
<label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>
<div class="col-sm-4">
<input type="tel" class="form-control form-control-sm" id="phoneNo" name="phoneNo">
</div>
<label for="email" class="col-sm-2 col-form-label col-form-label-sm text-center">이메일</label>
<div class="col-sm-4">
<input type="email" class="form-control form-control-sm" id="email" name="email">
</div>
</div>
<div class="row mb-1">
<label for="sex" class="col-sm-2 col-form-label col-form-label-sm text-center">성별</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="sex" name="sex">
<option value="SEX002">남</option>
<option value="SEX001">여</option>
</select>
</div>
</div>
<div class="row mb-1">
<label for="birthDate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm dateSelector" id="birthDate" name="birthDate" readonly>
</div>
<label for="policeInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">해양경찰배명일</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm dateSelector" id="policeInDate" name="policeInDate" readonly>
</div>
</div>
<div class="row mb-1">
<label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="ogCd" name="ogCd">
<option value="">--선택--</option>
<th:block th:each="code:${ogList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
<label for="organInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현관서전입일</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm dateSelector" id="organInDate" name="organInDate" readonly>
</div>
</div>
<div class="row mb-1">
<label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="ofcCd" name="ofcCd">
<option value="">--선택--</option>
<th:block th:each="code:${ofcList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
<label for="ofcInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현부서임용일</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm dateSelector" id="ofcInDate" name="ofcInDate" readonly>
</div>
</div>
<div class="row mb-1">
<label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">계급</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="titleCd" name="titleCd">
<option value="">--선택--</option>
<th:block th:each="code:${titleList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
<label for="titleInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현계급임용일</label>
<div class="col-sm-4">
<input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" readonly>
</div>
</div>
<div class="row mb-1">
<label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="outturnCd" name="outturnCd">
<option value="">--선택--</option>
<th:block th:each="code:${outturnList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
<label for="seriesCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직별</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="seriesCd" name="seriesCd">
<option value="">--선택--</option>
<th:block th:each="code:${seriesList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채</label>
<div class="col-sm-4">
<select class="form-select form-select-sm" id="languageCd" name="languageCd">
<option value="">--선택--</option>
<th:block th:each="code:${languageList}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
</th:block>
</select>
</div>
</div>
</form>
</div>
<div class="modal-footer" th:if="${joinFlag eq 'T'}">
<div class="modal-footer"><!-- th:if="${joinFlag eq 'T'}"-->
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="closeModalBtn">닫기</button>
<button type="button" class="btn btn-primary" id="saveBtn">신청</button>
</div>