롤백 소스 일부 복구

main
이범준 5 months ago
parent a4677913fd
commit a2da85fb48

@ -4,6 +4,7 @@ import org.springframework.boot.Banner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.ApplicationPidFileWriter;
import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.ImportResource;
import cokr.xit.base.ServletCustomizer; import cokr.xit.base.ServletCustomizer;
@ -33,7 +34,7 @@ public class FimsApplication extends XitBaseApplication {
application.setBannerMode(Banner.Mode.OFF); application.setBannerMode(Banner.Mode.OFF);
application.setLogStartupInfo(false); application.setLogStartupInfo(false);
//application.addListeners(new ApplicationPidFileWriter("fims.pid")); application.addListeners(new ApplicationPidFileWriter("fims.pid"));
application.run(args); application.run(args);
} }

@ -31,7 +31,10 @@ public class MainController extends cokr.xit.base.web.MainController {
@Override @Override
public ModelAndView loginPage() { public ModelAndView loginPage() {
return new ModelAndView("login"); ModelAndView mav = new ModelAndView("login");
List<DataObject> instList = fimsOgdpBean.selectAllInstList();
mav.addObject("instList", instList);
return mav;
} }
@Override @Override

@ -102,9 +102,10 @@ SELECT NEW_ID
, CONCAT(DIR, NEW_ID, '.', #{file.extension}) PATH , CONCAT(DIR, NEW_ID, '.', #{file.extension}) PATH
FROM ( FROM (
SELECT NVL(MAX(FILE_ID) + 1, CONCAT(THIS_DAY, '00001')) NEW_ID SELECT NVL(MAX(FILE_ID) + 1, CONCAT(THIS_DAY, '00001')) NEW_ID
FROM (<include refid="utility.selectThisDay" />) B LEFT OUTER JOIN FROM (<include refid="utility.selectThisDay" />) B
TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%') LEFT OUTER JOIN TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
) T1, ( ) T1
, (
<include refid="fileDirs" /> <include refid="fileDirs" />
WHERE INF_TYPE = #{file.infoType} WHERE INF_TYPE = #{file.infoType}
) T2 ) T2

@ -6,9 +6,32 @@
<div class="card"> <div class="card">
<form id="frmEdit--${pageName}" name="frmEdit"> <form id="frmEdit--${pageName}" name="frmEdit">
<input type="text" id="sggID--${pageName}" name="sggID" data-map="SGG_CD" hidden />
<input type="text" id="instCode--${pageName}" name="instCode" data-map="INST_CD" hidden />
<div class="row g-1" id="forRootAdmin--${pageName}" hidden>
<div class="col-md-6">
<label for="sggID--${pageName}"
class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">
시군구코드
</label>
<input type="text" id="sggID--${pageName}" name="sggID" data-map="SGG_CD"
class="form-control" required maxlength="7" />
</div>
<div class="col-md-6">
<label for="instCode--${pageName}"
class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">
기관코드
</label>
<input type="text" id="instCode--${pageName}" name="instCode" data-map="INST_CD"
class="form-control" required maxlength="7" />
</div>
</div>
<div class="row g-1"> <div class="row g-1">
<div class="col-md-6"> <div class="col-md-6">
@ -197,6 +220,11 @@ $(document).ready(function(){
/************************************************************************** /**************************************************************************
* 초기화 * 초기화
**************************************************************************/ **************************************************************************/
if(MY_INFO.institute == 'default') {
$("#forRootAdmin--${pageName}").removeAttr("hidden");
}
var deptInfo = ${deptInfo}; var deptInfo = ${deptInfo};
if(deptInfo != null){ if(deptInfo != null){
$("#deptID--${pageName}").attr("disabled","disabled"); $("#deptID--${pageName}").attr("disabled","disabled");
@ -207,10 +235,12 @@ $(document).ready(function(){
} }
} else { } else {
$P.deptControl.dataset.setData([]); $P.deptControl.dataset.setData([]);
$("#sggID--${pageName}").val(MY_INFO.info.sggCd);
$("#instCode--${pageName}").val(MY_INFO.info.instCd); if(MY_INFO.institute != 'default') {
$("#sggID--${pageName}").val(MY_INFO.info.sggCd);
$("#instCode--${pageName}").val(MY_INFO.info.instCd);
}
} }
}); });
</script> </script>
Loading…
Cancel
Save