단속파일등록 오류 수정

src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java

@@ -50,6 +50,7 @@ abstract public class LayoutParser {
 	}
 
 	String[] allItem = {
+		"FILE_LAYOUT_ID",
 		"FILE_GROUP_ID",
 		"FILE_GROUP_TYPE","FILE_PATH","FILE_NAME","FILE_LAST_MODIFIED","FILE_SIZE","FILE_EXTENSION","LINK_ENT_NM",
 		"FILE_SEQ","PHOTO_CNT","PHOTO_TYPE_CD","PHOTO_TYPE_NM","FILE_STATUS_CD","FILE_STATUS_NM",
@@ -113,6 +114,8 @@ abstract public class LayoutParser {
 		sortedFileList.forEach(item -> {
         	DataObject dataObject = this.createParsedDataObject();
         	dataObject.put("FILE_GROUP_TYPE", this.groupingType);
+        	dataObject.put("FILE_LAYOUT_ID", descriptor.getFileLayoutId());
+
         	File file = item.toFile();
         	this.setFileDefaultInfo(dataObject, file);
 

src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java

@@ -319,7 +319,7 @@ public class Crdn05Controller extends ApplicationController {
 	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
 	 * }</code></pre>
 	 */
-	public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileGroupType, String[] linkFileInfos) {
+	public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileLayoutId, String fileGroupType, String[] linkFileInfos) {
 		ModelAndView mav = new ModelAndView("jsonView");
 		String institute = currentUser().getInstitute();
 
@@ -336,7 +336,7 @@ public class Crdn05Controller extends ApplicationController {
 
 		processInfo.put("fileGroupType", fileGroupType);
 
-		String workPath = crdnStngBean.getLinkFileLayoutMetadata("fileLayoutId").getLinkFileLocation();
+		String workPath = crdnStngBean.getLinkFileLayoutMetadata(fileLayoutId).getLinkFileLocation();
 		processInfo.put("workPath", workPath);
 
 		HashMap<String, Object> resultMap = importService.createCrdnByEquipmentLinkFile(processInfo, linkFileInfoList);

src/main/java/cokr/xit/fims/task/web/BpvController.java

@@ -242,8 +242,8 @@ public class BpvController {
 
 		@Override
 		@RequestMapping(name="전용차로과태료업무 장비업체 단속파일로 단속자료 생성", value=METHOD_URL.createCrdnByLinkFile)
-		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileGroupType,  String[] linkFileInfos) {
-			return super.createCrdnByLinkFile(taskSeCd, fileGroupType, linkFileInfos);
+		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileLayoutId, String fileGroupType,  String[] linkFileInfos) {
+			return super.createCrdnByLinkFile(taskSeCd, fileLayoutId, fileGroupType, linkFileInfos);
 		}
 
 		@Override

src/main/java/cokr/xit/fims/task/web/DpvController.java

@@ -268,8 +268,8 @@ public class DpvController {
 
 		@Override
 		@RequestMapping(name="장애인과태료업무 장비업체 단속파일로 단속자료 생성", value=METHOD_URL.createCrdnByLinkFile)
-		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileGroupType, String[] linkFileInfos) {
-			return super.createCrdnByLinkFile(taskSeCd, fileGroupType, linkFileInfos);
+		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileLayoutId, String fileGroupType, String[] linkFileInfos) {
+			return super.createCrdnByLinkFile(taskSeCd, fileLayoutId, fileGroupType, linkFileInfos);
 		}
 
 		@Override

src/main/java/cokr/xit/fims/task/web/EcaController.java

@@ -243,8 +243,8 @@ public class EcaController {
 
 		@Override
 		@RequestMapping(name="전기차과태료업무 장비업체 단속파일로 단속자료 생성", value=METHOD_URL.createCrdnByLinkFile)
-		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileGroupType,  String[] linkFileInfos) {
-			return super.createCrdnByLinkFile(taskSeCd, fileGroupType, linkFileInfos);
+		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileLayoutId, String fileGroupType,  String[] linkFileInfos) {
+			return super.createCrdnByLinkFile(taskSeCd, fileLayoutId, fileGroupType, linkFileInfos);
 		}
 
 		@Override

src/main/java/cokr/xit/fims/task/web/PvsController.java

@@ -255,8 +255,8 @@ public class PvsController {
 
 		@Override
 		@RequestMapping(name="주정차과태료업무 장비업체 단속파일로 단속자료 생성", value=METHOD_URL.createCrdnByLinkFile)
-		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileGroupType, String[] linkFileInfos) {
-			return super.createCrdnByLinkFile(taskSeCd, fileGroupType, linkFileInfos);
+		public ModelAndView createCrdnByLinkFile(String taskSeCd, String fileLayoutId, String fileGroupType, String[] linkFileInfos) {
+			return super.createCrdnByLinkFile(taskSeCd, fileLayoutId, fileGroupType, linkFileInfos);
 		}
 
 		@Override

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp

@@ -360,6 +360,7 @@ $(document).ready(function(){
 		var formData = new FormData(document.getElementById("frmMultipart--${pageName}"));
 		formData.append("taskSeCd", "${taskSeCd}");
 		formData.append("fileGroupType", $P.tempGroup[firstGroupKey][0].FILE_GROUP_TYPE);
+		formData.append("fileLayoutId", $P.tempGroup[firstGroupKey][0].FILE_LAYOUT_ID);
 		if($P.tempGroup[firstGroupKey].length == 1){
 			formData.append("linkFileInfos", JSON.stringify({}));
 		}