fix : 수정 중

src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java

@@ -169,8 +169,10 @@ public class FimsCrackDownMgtController extends AbstractController {
     public ModelAndView findCrackdownInfoAndAttchFiles(final FimsCrackdownDTO.Request dto) {
         ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW);
 
-        mav.addAllObjects(service.findCrackdownInfo(dto));
-        mav.addObject("attchFiles", rtService.findRtRegltAttchFiles(dto));
+        Map<String,Object> dtlData = service.findCrackdownInfo(dto);
+        mav.addAllObjects(dtlData);
+        mav.addObject("attchFiles", null);
+        //mav.addObject("attchFiles", rtService.findRtRegltAttchFiles(dto));
         return mav;
     }
 

src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp

@@ -29,9 +29,7 @@ Date       Author       Description
     background-color: darkred;
   }
 
-  .curImgData {
-    border: 1px solid black;
-  }
+
   /* 단속 건수 */
   .empCls {
     color: #2a48ff;
@@ -320,7 +318,7 @@ Date       Author       Description
         ,data: params
         ,success: (res) => {
           let dataKey = '';
-          let curId = '';
+          let curId = res.infoDTO.crdnId;
           let vhrnoCnt = 0;
           crdnSeCd = res.infoDTO.crdnSeCd;
 
@@ -328,17 +326,18 @@ Date       Author       Description
             isCtzn = true;
             imgPk = res.infoDTO.interfaceSeqN;
             dataKey = imgPk + ' - ' + res.infoDTO.ctznSttemntDetailSn;
-            curId = imgPk + res.infoDTO.ctznSttemntDetailSn;
           }else{
             isCtzn = false;
             imgPk = res.infoDTO.extrlRegltCntcId;
             dataKey = imgPk;
-            curId = imgPk;
           }
-          $('#txtTitle').html(
-            ComboCodeData.crdnSeCd.filter(d => d.value === crdnSeCd)[0].text
-            + '   [ ' + dataKey + ' ]'
-          );
+
+          let crdnSeNm = "";
+          if(crdnSeCd != null && crdnSeCd != ""){
+            crdnSeNm = ComboCodeData.crdnSeCd.filter(d => d.value === crdnSeCd)[0].text;
+          }
+          $('#txtTitle').html(crdnSeNm + '   [ ' + dataKey + ' ]');
+
           fnPopupBiz.showCrackdownVhrnoCnt(res.infoDTO.vhrnoCnt);
           fnPopupBiz.showMinwonCnt(res.infoDTO.minwonCnt);
           schParam = {
@@ -349,7 +348,7 @@ Date       Author       Description
           }
 
           cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px',
-            () => document.getElementById(curId).className += ' curImgData'
+            () => ''
           );
 
           let navObj = {};

src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp

@@ -29,9 +29,7 @@ Date       Author       Description
   .act_bg_color {
     background-color: #d8e7ff;
   }
-  .curImgData {
-    border: 1px solid black;
-  }
+
 </style>
 
 <%--2022.10.05 박소영 웹폰트 링크 추가--%>
@@ -910,15 +908,10 @@ Date       Author       Description
         ,url: fimsApiUrl.FIND_CRACKDOWN_INFO
         ,data: params
         ,success: (res) => {
-          let curId = '';
-          const crdnSeCd = res.infoDTO.crdnSeCd;
-          if(crdnSeCd === '${citizen}'){
-            curId = res.infoDTO.interfaceSeqN + res.infoDTO.ctznSttemntDetailSn;
-          }else{
-            curId = res.infoDTO.extrlRegltCntcId;
-          }
+
+          let curId = res.infoDTO.crdnId;
           cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px',
-            () => document.getElementById(curId).className += ' curImgData'
+            () => ''
           );
 
           let navObj = {};

src/main/webapp/resources/js/fims/framework/cmm/cmmDownloadImg.js

@@ -15,49 +15,51 @@ function cmmImgDownload(divImgListElementId, cmmFileDtls, fnBizPagePopup = fnBiz
     const downloadUrl = '/framework/biz/cmm/file/download.do';
 
     $(divImgListElementId).children().remove();
+    if(cmmFileDtls != null){
+        cmmFileDtls.forEach((dtl, idx) => {
+            let imgDiv = document.getElementById(dtl.fileJobId);
+            if(!imgDiv?.hasChildNodes()){
+                imgDiv = document.createElement("div");
+                imgDiv.setAttribute("id", dtl.fileJobId);
+                imgDiv.setAttribute("value", dtl.fileMastrId);
+                imgDiv.setAttribute("class", "dragDiv")
+            }
 
-    cmmFileDtls.forEach((dtl, idx) => {
-        let imgDiv = document.getElementById(dtl.fileJobId);
-        if(!imgDiv?.hasChildNodes()){
-            imgDiv = document.createElement("div");
-            imgDiv.setAttribute("id", dtl.fileJobId);
-            imgDiv.setAttribute("value", dtl.fileMastrId);
-            imgDiv.setAttribute("class", "dragDiv")
-        }
+            //const params = `?filename=${dtl.orginlFileNm}&` + $.param(dtl);
+            const params = `?fileId=${dtl.fileId}&fileCours=${dtl.fileCours}&orginlFileNm=${dtl.orginlFileNm}`;
+            const title = dtl.orginlFileNm;
+
+            const x = document.createElement("img");
+            //x.setAttribute("class", "draggable")
+            x.setAttribute("src", downloadUrl+params);
+            x.setAttribute("id", dtl.fileId);
+            x.setAttribute("class", "draggable")
+            x.style = 'width:'+ thumbnailSize;
+            x.style = 'height:'+ thumbnailSize;
+            //x.style = 'object-fit: "contain";';
+            //x.style = 'object-fit: scale-down;';
+            x.setAttribute("title", title);
+            x.setAttribute("alt", dtl.orginlFileNm);
+            x.setAttribute("name", dtl.orginlFileNm);
+            x.setAttribute("data-file-mastr-id", dtl.fileMastrId);
+            x.setAttribute("data-file-id", dtl.fileId);
+            x.setAttribute("data-file-cours", dtl.fileCours);
+            x.setAttribute("data-file-cpcty", dtl.fileCpcty);
+
+            x.addEventListener('dblclick', (e)=>{
+                if(isEditor) {
+                    fnBizPagePopup('imageEditor', {imageTagId: dtl.fileId});
+                }else{
+                    dtl.downloadUrl = downloadUrl+params;
+                    //dtl.editor = true;
+                    fnBizPagePopup('imageView', dtl);
+                }
+            })
+            imgDiv.appendChild(x);
+            document.querySelector(divImgListElementId).appendChild(imgDiv);
+        });
+    }
 
-        //const params = `?filename=${dtl.orginlFileNm}&` + $.param(dtl);
-        const params = `?fileId=${dtl.fileId}&fileCours=${dtl.fileCours}&orginlFileNm=${dtl.orginlFileNm}`;
-        const title = dtl.orginlFileNm;
-
-        const x = document.createElement("img");
-        //x.setAttribute("class", "draggable")
-        x.setAttribute("src", downloadUrl+params);
-        x.setAttribute("id", dtl.fileId);
-        x.setAttribute("class", "draggable")
-        x.style = 'width:'+ thumbnailSize;
-        x.style = 'height:'+ thumbnailSize;
-        //x.style = 'object-fit: "contain";';
-        //x.style = 'object-fit: scale-down;';
-        x.setAttribute("title", title);
-        x.setAttribute("alt", dtl.orginlFileNm);
-        x.setAttribute("name", dtl.orginlFileNm);
-        x.setAttribute("data-file-mastr-id", dtl.fileMastrId);
-        x.setAttribute("data-file-id", dtl.fileId);
-        x.setAttribute("data-file-cours", dtl.fileCours);
-        x.setAttribute("data-file-cpcty", dtl.fileCpcty);
-
-        x.addEventListener('dblclick', (e)=>{
-            if(isEditor) {
-                fnBizPagePopup('imageEditor', {imageTagId: dtl.fileId});
-            }else{
-                dtl.downloadUrl = downloadUrl+params;
-                //dtl.editor = true;
-                fnBizPagePopup('imageView', dtl);
-            }
-        })
-        imgDiv.appendChild(x);
-        document.querySelector(divImgListElementId).appendChild(imgDiv);
-    })
     dragable();
     if(callback)     callback();
 }