diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java
index c22bcc91..ff7701e3 100644
--- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java
+++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.util.StringUtil;
import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.kccadr.accdnt.ans.service.AnsVO;
import kcc.kccadr.cmm.RestResponse;
@@ -155,7 +156,9 @@ public class InnorixFileController {
if(userId.equals("")) {
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
- adrInnorixFileVO.setUniqId(userId);
+ if(StringUtil.isEmpty(adrInnorixFileVO.getUniqId())) {
+ adrInnorixFileVO.setUniqId(userId);
+ }
return ResponseEntity.ok(innorixService.insertInnorixLctrPlanFile(adrInnorixFileVO));
}
@@ -301,8 +304,9 @@ public class InnorixFileController {
if(userId.equals("")) {
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
- adrInnorixFileVO.setUniqId(userId);
-
+ if(StringUtil.isEmpty(adrInnorixFileVO.getUniqId())) {
+ adrInnorixFileVO.setUniqId(userId);
+ }
return ResponseEntity.ok(innorixService.insertInnorixDocAtchFile(adrInnorixFileVO));
}
}
\ No newline at end of file
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java
index dd8339a7..cd469a5d 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmVO.java
@@ -43,6 +43,7 @@ public class VEAPrcsAplctPrdInstrAsgnmVO extends ComDefaultVO implements Seriali
// ve_instr_detail
private String instrNm; // 강사 이름
private String phone; // phone
+ private String rprtFileType; // 첨부파일 종류
public String getPrcsAplctPrdOrd() {
return prcsAplctPrdOrd;
@@ -156,6 +157,14 @@ public class VEAPrcsAplctPrdInstrAsgnmVO extends ComDefaultVO implements Seriali
this.phone = phone;
}
+ public String getRprtFileType() {
+ return rprtFileType;
+ }
+
+ public void setRprtFileType(String rprtFileType) {
+ this.rprtFileType = rprtFileType;
+ }
+
diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java
index 5178e38f..b437ddff 100644
--- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java
@@ -656,6 +656,19 @@ public class OprtnStateMngController {
return "oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup";
}
+
+ /* 관리자 결과보고 등록 팝업(실무)
+ *
+ *
+ * */
+ @RequestMapping(value = "popup/fndthRsltRprtfileInsertPopup.do")
+ public String fndthRsltRprtfileInsertPopup(
+ @ModelAttribute("vEAPrcsAplctPrdInstrAsgnmVO") VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO, ModelMap model
+ ) throws Exception {
+
+
+ return "oprtn/cpyrgExprnClsrm/popup/fndthRsltRprtfileInsertPopup";
+ }
/**
* 교육실적통계 화면
*/
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml
index 500bcd69..b6e25065 100644
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@@ -51,8 +51,7 @@