Merge branch 'refs/heads/main' into main-dsuse-rslt-img

# Conflicts:
#	src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java
#	src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java

@@ -51,7 +51,6 @@ public class DisposeProcessDetails extends HWPFormat {
 		for(int a=0;a<partitions.size();a++) {
 			DataObject partitionN = partitions.get(a);
 			String titleArg1 = partitionN.string("dsuseMthNm");
-			String titleArg2 = "";
 			List<String> photos = (List<String>)partitionN.get("dsuseimgPaths");
 
 			for(int i=0;i<photos.size();i++) {

src/main/java/cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java

@@ -4,19 +4,18 @@ import java.util.List;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
-import cokr.xit.adds.nims.DsuseMgtDetailQuery;
 import cokr.xit.adds.nims.DsuseMgtDocQuery;
 import cokr.xit.foundation.component.AbstractMapper;
 import cokr.xit.foundation.data.DataObject;
 
-/** 폐기관리상세 정보 DAO
+/** 폐기보고문서관리 정보 DAO
  */
 @Mapper("dsuseMgtDocMapper")
 public interface DsuseMgtDocMapper extends AbstractMapper {
 
-	/**지정한 조건에 따라 폐기관리상세 목록을 조회하여 반환한다.<br />
-	 * @param req 폐기관리상세 조회 조건
-	 * @return 폐기관리상세 목록
+	/**지정한 조건에 따라 폐기보고문서관리 목록을 조회하여 반환한다.<br />
+	 * @param req 폐기보고문서관리 조회 조건
+	 * @return 폐기보고문서관리 목록
 	 */
 	List<DataObject> selectDsuseMgtDocList(DsuseMgtDocQuery req);
 

src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDocServiceBean.java

@@ -1,34 +1,24 @@
 package cokr.xit.adds.nims.service.bean;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
 import cokr.xit.adds.nims.DsuseMgtDocQuery;
-import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
 import cokr.xit.adds.nims.dao.DsuseMgtDocMapper;
-import cokr.xit.adds.nims.dao.DsuseMgtReceiptMapper;
 import cokr.xit.adds.nims.service.DsuseMgtDocService;
-import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
-import cokr.xit.base.code.service.bean.CodeBean;
-import cokr.xit.base.file.FileInfo;
-import cokr.xit.base.file.service.FileQuery;
-import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.foundation.component.AbstractServiceBean;
 import cokr.xit.foundation.data.DataObject;
 
 @Service("dsuseMgtDocService")
 public class DsuseMgtDocServiceBean extends AbstractServiceBean implements DsuseMgtDocService {
 
-	/** 폐기관리접수 정보 DAO */
+	/** 폐기보고문서관리 정보 DAO */
 	@Resource(name = "dsuseMgtDocMapper")
 	private DsuseMgtDocMapper dsuseMgtDocMapper;
-	
+
 	@Override
 	public List<DataObject> getDsuseMgtDocList(DsuseMgtDocQuery query){
 		return dsuseMgtDocMapper.selectDsuseMgtDocList(query);

src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java

@@ -18,10 +18,12 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 	/** 폐기관리접수 정보 DAO */
 	@Resource(name = "dsuseMgtReceiptMapper")
 	private DsuseMgtReceiptMapper dsuseMgtReceiptMapper;
-	
+
 	@Override
 	public List<DataObject> getDsuseMgtReceiptList(DsuseMgtReceiptQuery query){
-		//query.setOrderBy("DSCDMNG_ID DESC");
+		if(ifEmpty(query.getOrderBy(), ()->"").equals("")) {
+			query.setOrderBy("DSCDMNG_ID DESC");
+		}
 
 		return dsuseMgtReceiptMapper.selectDsuseMgtReceiptList(query);
 	}
@@ -30,11 +32,12 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 	public DataObject getDsuseMgtReceiptInfo(String dscdmngId){
 		return dsuseMgtReceiptMapper.selectDsuseMgtReceiptInfo(dscdmngId);
 	}
-	
+
 	/** 신청서 접수 삭제.
 	 * @param DsuseMgtReceiptQuery
 	 * @return 저장된 정보수
 	 */
+	@Override
 	public String removeDsuseMgt(DsuseMgtReceiptQuery query) {
 		if(dsuseMgtReceiptMapper.removeDsuseMgt(query) == 1) {
 			return "[S]";
@@ -42,11 +45,12 @@ public class DsuseMgtReceiptServiceBean extends AbstractServiceBean implements D
 			return "[F]";
 		}
 	}
-	
+
 	/** 처리상태 수정.
 	 * @param DsuseMgtReceiptQuery
 	 * @return 저장된 정보수
 	 */
+	@Override
 	public String updatePrgsSttusOfDsuseMgt(DsuseMgtReceiptQuery query) {
 		if(dsuseMgtReceiptMapper.updatePrgsSttusOfDsuseMgt(query) == 1) {
 			return "[S]";

src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cokr.xit.adds.nims.dao.DsuseMgtDocMapper">
 
-<!-- 폐기관리상세 정보 매퍼
+<!-- 폐기보고문서관리 정보 매퍼
  -->
 
     <sql id="select">