fix: 서버 배포 설정 fix

단속관리 목록 조회 정렬 순서 fix

pom.xml

@@ -667,6 +667,13 @@
 		-->
 		<!-- ClassNotFoundException: com.sun.xml.internal.bind.v2.ContextFactory에러 방지 -->
 
+		<!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
+		<dependency>
+			<groupId>org.jasypt</groupId>
+			<artifactId>jasypt-spring31</artifactId>
+			<version>1.9.3</version>
+		</dependency>
+
 
 	</dependencies>
 
@@ -674,8 +681,47 @@
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
 		<finalName>fims</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>*.properties</include>
+					<include>*-${env}.xml</include>
+					<include>**/${env}/*</include>
+					<include>message/**/*</include>
+					<include>spring/*.xml</include>
+					<include>spring/*/*.xml</include>
+					<include>spring/service/cache/*.xml</include>
+					<include>sqlmapper/**/*</include>
+					<include>validator/**/*</include>
+				</includes>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<pluginManagement>
             <plugins>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>copy-resources</id>
+							<!-- here the phase you need -->
+							<phase>validate</phase>
+							<goals>
+								<goal>copy-resources</goal>
+							</goals>
+							<configuration>
+								<outputDirectory>${basedir}/target/dockerfile</outputDirectory>
+								<resources>
+									<resource>
+										<directory>src/main/docker</directory>
+										<filtering>true</filtering>
+									</resource>
+								</resources>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
                 <plugin>
                     <groupId>org.apache.tomcat.maven</groupId>
                     <artifactId>tomcat7-maven-plugin</artifactId>
@@ -914,5 +960,29 @@
             </plugin>
         </plugins>
     </reporting>
+
+	<profiles>
+		<!-- default : local configuration -->
+		<profile>
+			<id>local</id>
+			<properties>
+				<env>local</env>
+			</properties>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+
+		<!-- dev configuration -->
+		<profile>
+			<id>dev</id>
+			<properties>
+				<env>dev</env>
+			</properties>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+		</profile>
+	</profiles>
 </project>
 

src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml

@@ -467,7 +467,7 @@
                                         FROM tb_ec_ctzn_sttemnt_detail
                                        WHERE reglt_id = #{regltId})
              </if>
-         ORDER BY tcfd.orginl_file_nm
+         ORDER BY tcfm.file_job_id, tcfd.orginl_file_nm
     </select>
 
     <!--

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

@@ -42,6 +42,9 @@ Date       Author       Description
   select[name=payerSeCode] {
     width: 25%;
   }
+  .curImgData {
+    border: 1px solid black;
+  }
 </style>
 
 <div class="popup" style="min-width: 100px;">
@@ -288,18 +291,22 @@ Date       Author       Description
         ,data: params
         ,success: (res) => {
           let dataKey = '';
+          let curId = '';
           const regltSeCode = res.infoDTO.regltSeCode;
-          //FIXME : 시민신고상세 순번까지 포함하여 보여줄지 여부 결정 필요
           if(regltSeCode === '${citizen}'){
             dataKey = res.infoDTO.interfaceSeqN + ' - ' + res.infoDTO.ctznSttemntDetailSn;
+            curId = res.infoDTO.interfaceSeqN + res.infoDTO.ctznSttemntDetailSn;
           }else{
             dataKey = res.infoDTO.extrlRegltCntcId;
+            curId = dataKey;
           }
           $('#txtTitle').html(
             ComboCodeData.regltSeCode.filter(d => d.value === res.infoDTO.regltSeCode)[0].text
             + '&nbsp;&nbsp;&nbsp;[&nbsp;' + dataKey + '&nbsp;]'
           );
-          cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px');
+          cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px',
+            () => document.getElementById(curId).className += ' curImgData'
+          );
 
           window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].reloadNav($('#prev'), $('#next'), $('span#totCnt'))
           fnPopupBiz.resetDisplay(res.ctznDTO?.cvplRceptNo);

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

@@ -26,6 +26,9 @@ Date       Author       Description
   .act_bg_color {
     background-color: #d8e7ff;
   }
+  .curImgData {
+    border: 1px solid black;
+  }
 </style>
 
 <%--2022.10.05 박소영 웹폰트 링크 추가--%>
@@ -638,7 +641,16 @@ Date       Author       Description
         ,url: fimsApiUrl.FIND_CRACKDOWN_INFO
         ,data: params
         ,success: (res) => {
-          cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px');
+          let curId = '';
+          const regltSeCode = res.infoDTO.regltSeCode;
+          if(regltSeCode === '${citizen}'){
+            curId = res.infoDTO.interfaceSeqN + res.infoDTO.ctznSttemntDetailSn;
+          }else{
+            curId = res.infoDTO.extrlRegltCntcId;
+          }
+          cmmImgDownload('#imgList', res.attchFiles, fnPopupBiz.pagePopup, true, '60px',
+            () => document.getElementById(curId).className += ' curImgData'
+          );
           window.opener.ARR_NAV[window.opener.CUR_TAB_IDX].reloadNav($('#prev'), $('#next'), $('span#totCnt'))
 
           fnPopupBiz.resetDisplay(res.ctznDTO?.cvplRceptNo);

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

@@ -11,7 +11,7 @@
  * @param {string} thumbnailSize 썸네일 이미지 크기 - default 100px
  * </pre>
  */
-function cmmImgDownload(divImgListElementId, cmmFileDtls, fnBizPagePopup = fnBiz.pagePopup, isEditor, thumbnailSize = '100px') {
+function cmmImgDownload(divImgListElementId, cmmFileDtls, fnBizPagePopup = fnBiz.pagePopup, isEditor, thumbnailSize = '100px', callback) {
     const downloadUrl = '/framework/biz/cmm/file/download.do';
 
     $(divImgListElementId).children().remove();
@@ -59,6 +59,7 @@ function cmmImgDownload(divImgListElementId, cmmFileDtls, fnBizPagePopup = fnBiz
         document.querySelector(divImgListElementId).appendChild(imgDiv);
     })
     dragable();
+    if(callback)     callback();
 }
 
 /**