diff --git a/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java index 28cfe66b..4ee35453 100644 --- a/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java +++ b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java @@ -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 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 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; +// } } diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index ccb492f5..1858be26 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -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; +// } } diff --git a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java index cddb0fe1..caae87b1 100644 --- a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java +++ b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java @@ -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; } diff --git a/src/main/java/com/dbnt/faisp/kwms/model/VHordYundongStat.java b/src/main/java/com/dbnt/faisp/kwms/model/VHordYundongStat.java index 32202516..e75b38fb 100644 --- a/src/main/java/com/dbnt/faisp/kwms/model/VHordYundongStat.java +++ b/src/main/java/com/dbnt/faisp/kwms/model/VHordYundongStat.java @@ -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; } diff --git a/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java index 79c4b302..fed8fb52 100644 --- a/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java +++ b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; -public interface VEmployeeRepository extends JpaRepository { - - Optional findByDicCode(String dicCode); +//public interface VEmployeeRepository extends JpaRepository { +public interface VEmployeeRepository { +// Optional findByDicCode(String dicCode); } diff --git a/src/main/java/com/dbnt/faisp/kwms/repository/VHordYundongStatRepository.java b/src/main/java/com/dbnt/faisp/kwms/repository/VHordYundongStatRepository.java index 77309e8b..efd39c5f 100644 --- a/src/main/java/com/dbnt/faisp/kwms/repository/VHordYundongStatRepository.java +++ b/src/main/java/com/dbnt/faisp/kwms/repository/VHordYundongStatRepository.java @@ -6,7 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface VHordYundongStatRepository extends JpaRepository { +//public interface VHordYundongStatRepository extends JpaRepository { +public interface VHordYundongStatRepository { - List findByDicCodeOrderByStartDateDesc(String dicCode); +// List findByDicCodeOrderByStartDateDesc(String dicCode); } diff --git a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java index 87a193d2..a19bbdd6 100644 --- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java +++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java @@ -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 selectUserCareerList(Integer userSeq, String dicCode) { - List statList = vHordRepository.findByDicCodeOrderByStartDateDesc(dicCode); - List savedList = careerRepository.findByUserSeqOrderByStartDateDesc(userSeq); - List 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 selectUserCareerList(Integer userSeq, String dicCode) { +// List statList = vHordRepository.findByDicCodeOrderByStartDateDesc(dicCode); +// List savedList = careerRepository.findByUserSeqOrderByStartDateDesc(userSeq); +// List 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; +// } } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java index d4b12317..57fb9ee6 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -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){ diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java index 580dde38..5986eae0 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java @@ -133,13 +133,13 @@ public class PoliceController { @PostMapping("/syncUserInfoToKwms") @ResponseBody public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List 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{ diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java index cfadcb95..1cd5cb02 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java @@ -90,13 +90,13 @@ public class UserMgtController { @PostMapping("/syncUserInfoToKwms") @ResponseBody public String syncUserInfoToKwms(@AuthenticationPrincipal UserInfo loginUser,@RequestBody List 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{ diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index 3d64b5b0..d0f55497 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -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 (){ diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 7356eb31..c700d39e 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -5,7 +5,7 @@
사용자 신청
-
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+
+
+ +
+ + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
-
+