From 88a89e3dd4122b4ed28cb40313ed9397ae1d1e7c Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 18 Jul 2024 09:12:43 +0900 Subject: [PATCH] =?UTF-8?q?order=20by=20=EC=A0=95=EB=A0=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95,=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmmn/hwp/format/DisposeProcessDetails.java | 1 - .../cokr/xit/adds/nims/dao/DsuseMgtDocMapper.java | 9 ++++----- .../nims/service/bean/DsuseMgtDocServiceBean.java | 14 ++------------ .../service/bean/DsuseMgtReceiptServiceBean.java | 12 ++++++++---- .../cokr/xit/adds/nims/web/AddsNimsController.java | 5 ++++- .../sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml | 2 +- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java b/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java index af68c01..d20fac4 100644 --- a/src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java +++ b/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 photos = (List)partitionN.get("dsuseimgPaths"); for(int i=0;i - * @param req 폐기관리상세 조회 조건 - * @return 폐기관리상세 목록 + /**지정한 조건에 따라 폐기보고문서관리 목록을 조회하여 반환한다.
+ * @param req 폐기보고문서관리 조회 조건 + * @return 폐기보고문서관리 목록 */ List selectDsuseMgtDocList(DsuseMgtDocQuery req); diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDocServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDocServiceBean.java index edb699b..0c89759 100644 --- a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtDocServiceBean.java +++ b/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 getDsuseMgtDocList(DsuseMgtDocQuery query){ return dsuseMgtDocMapper.selectDsuseMgtDocList(query); diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java index f52e47c..5824091 100644 --- a/src/main/java/cokr/xit/adds/nims/service/bean/DsuseMgtReceiptServiceBean.java +++ b/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 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]"; diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index 624577d..2f6ed15 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -174,6 +174,9 @@ public class AddsNimsController extends ApplicationController { //------------------------------------------------------------------------------------------------- @RequestMapping(value = "dsuseMgtRslt-list.do", name="결과[통보] 처리 조회") public ModelAndView getDsuseMgtRsltList(DsuseMgtReceiptQuery query) { + + query.setOrderBy("dsuse_de DESC, dsuse_mth_cd, dscdmng_id DESC"); + setFetchSize(query); return setCollectionInfo(new ModelAndView("jsonView"), dsuseMgtReceiptService.getDsuseMgtReceiptList(query),"",""); @@ -249,7 +252,7 @@ public class AddsNimsController extends ApplicationController { //------------------------------------------------------------------------------------------------- // 보고 문서 관리 //------------------------------------------------------------------------------------------------- - @RequestMapping(value = "dsuseMgtDoc-list.do", name="결과[통보] 처리 조회") + @RequestMapping(value = "dsuseMgtDoc-list.do", name="보고문서관리 목록 조회") public ModelAndView getDsuseMgtDocList(DsuseMgtDocQuery query) { query.setOrderBy("dsuse_de DESC, dsuse_mth_cd, dscdmng_id DESC"); setFetchSize(query); diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml index 3d8f8c0..40fd070 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml @@ -2,7 +2,7 @@ -