From 72e657893d2b1cbdbc1f5f6239785750686cca3c Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Wed, 17 Jul 2024 20:58:50 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EB=B3=B4=EA=B3=A0?= =?UTF-8?q?=20=EC=84=9C=EB=B2=84=20=ED=98=B8=EC=B6=9C=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 432 +++++++++--------- 1 file changed, 215 insertions(+), 217 deletions(-) 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 b989e98..624577d 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -72,9 +72,6 @@ public class AddsNimsController extends ApplicationController { @Value("${app.inf.nims.api.seqInfo}") private String productSeqInfoEndpoint; - @Value("${app.inf.nims.api.productAndseqInfo}") - private String productAndseqInfoEndpoint; - @Value("${app.inf.nims.api.prdMnfSeqInfoOfBarcode}") private String prdMnfSeqInfoOfBarcodeEndpoint; @@ -301,210 +298,6 @@ public class AddsNimsController extends ApplicationController { return null; } - - @RequestMapping(value="/makeDisposeResultReportHwp.do", name="폐기결과보고서 HWP파일 생성") - public ModelAndView makeDisposeResultReportHwp(String dtls) { - ModelAndView mav = new ModelAndView(); - mav.setViewName("downloadView"); - - List dataForDoc = fromJson(dtls, new TypeReference>() {}); - - //출력일시,출력작업자 - Print print = new Print(); - print.setPrintRequestUserInfo(currentUser()); - print.setTempPathConfig(fileRootPath); - - //개인정보표시여부,기관장 등 - PrintOption printOption = new PrintOption(); - Map globalVariable = new HashMap(); - printOption.setGlobalVariable(globalVariable); - - - for(DataObject data : dataForDoc) { - String infKey = data.string("dscdmngId"); - String subType = data.string("dscdmngSn"); - - List fileinfo = fileService.getFileList( - new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) - ); - if(fileinfo == null) { fileinfo = new ArrayList(); } - fileinfo = fileinfo.stream() - .filter((item) -> item.string("USE_YN").equals("Y")) - .sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID"))) - .toList(); - - if(fileinfo.isEmpty()) { - data.put("filePath", ""); - } else { - data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH")); - } - - } - - //1.한글문서파일 데이터 입력 - DisposeResultReport form = new DisposeResultReport(print, printOption, dataForDoc); - //2.한글문서파일 생성 - form.makeFile(); - //3.DB 저장, 스토리지 저장 - List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { - return dataForDoc.get(i-1).string("dscdmngId"); - }).collect(Collectors.toList()); - boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; - if(allEqual) { - String resultFilePath = form.andGetPath(); - File file = new File(resultFilePath); - String newFileId = ""; - String before = ""; - boolean changeDscdmngId = false; - for(DataObject data : dataForDoc) { - if(!before.equals(data.string("dscdmngId"))) { - changeDscdmngId = true; - } else { - changeDscdmngId = false; - } - if(changeDscdmngId) { - Relation rel = new Relation().setInfoType("200").setSubType("01").setInfoKey(data.string("dscdmngId")); - FileInfo fileInfo = new FileInfo.Factory().create(rel, file); - fileInfo.setName(print.getFormatKorName()+".hwp"); - int effected = fileService.create(fileInfo); - newFileId = fileInfo.getId(); - } - } - } - //4.다운로드 - HashMap result = form.andDownload(); - mav.addAllObjects(result); - return mav; - } - - - - @RequestMapping(value="/makeDisposeProcessDetailsHwp.do", name="폐기 처리 내역 및 사진 HWP파일 생성") - public ModelAndView makeDisposeProcessDetailsHwp(String dtls) { - ModelAndView mav = new ModelAndView(); - mav.setViewName("downloadView"); - - List dataForDoc = fromJson(dtls, new TypeReference>() {}); - - //출력일시,출력작업자 - Print print = new Print(); - print.setPrintRequestUserInfo(currentUser()); - print.setTempPathConfig(fileRootPath); - - //개인정보표시여부,기관장 등 - PrintOption printOption = new PrintOption(); - Map globalVariable = new HashMap(); - printOption.setGlobalVariable(globalVariable); - - - //제품사진 - for(DataObject data : dataForDoc) { - String infKey = data.string("dscdmngId"); - String subType = data.string("dscdmngSn"); - - List fileinfo = fileService.getFileList( - new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) - ); - if(fileinfo == null) { fileinfo = new ArrayList(); } - fileinfo = fileinfo.stream() - .filter((item) -> item.string("USE_YN").equals("Y")) - .sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID"))) - .toList(); - - if(fileinfo.isEmpty()) { - data.put("filePath", ""); - } else { - data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH")); - } - - } - - //폐기증거사진 - List partitions = this.getPartitions(dataForDoc); - - //1.한글문서파일 데이터 입력 - DisposeProcessDetails form = new DisposeProcessDetails(print, printOption, dataForDoc, partitions); - //2.한글문서파일 생성 - form.makeFile(); - //3.DB 저장, 스토리지 저장 - List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { - return dataForDoc.get(i-1).string("dscdmngId"); - }).collect(Collectors.toList()); - boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; - if(allEqual) { - String resultFilePath = form.andGetPath(); - File file = new File(resultFilePath); - String newFileId = ""; - String before = ""; - boolean changeDscdmngId = false; - for(DataObject data : dataForDoc) { - if(!before.equals(data.string("dscdmngId"))) { - changeDscdmngId = true; - } else { - changeDscdmngId = false; - } - if(changeDscdmngId) { - Relation rel = new Relation().setInfoType("200").setSubType("02").setInfoKey(data.string("dscdmngId")); - FileInfo fileInfo = new FileInfo.Factory().create(rel, file); - fileInfo.setName(print.getFormatKorName()+".hwp"); - int effected= fileService.create(fileInfo); - newFileId = fileInfo.getId(); - } - } - } - - //4.다운로드 - HashMap result = form.andDownload(); - mav.addAllObjects(result); - return mav; - } - - private List getPartitions(List dataForDoc){ - List partitions = new ArrayList<>(); - String before = ""; - boolean changeDscdmngId = false; - for(DataObject data : dataForDoc) { - if(!before.equals(data.string("dscdmngId"))) { - changeDscdmngId = true; - before = data.string("dscdmngId"); - } else { - changeDscdmngId = false; - } - - if(changeDscdmngId) { - DataObject partition = new DataObject(); - partition.set("dsuseMthNm", data.string("dsuseMthNm")); - - List dsuseimgs = fileService.getFileList( - new FileQuery().setInfoType("110").setInfoKeys(data.string("dscdmngId")) - ); - if(dsuseimgs == null) { dsuseimgs = new ArrayList(); } - dsuseimgs = dsuseimgs.stream() - .filter((item) -> item.string("USE_YN").equals("Y")) - .sorted((item1, item2) -> { - int a = item1.number("SRT_ORD").intValue(); - int b = item2.number("SRT_ORD").intValue(); - return (a < b) ? -1 : ((a == b) ? 0 : 1); - }) - .toList(); - - if(dsuseimgs.isEmpty()) { - continue; - } - - List dsuseimgPaths = new ArrayList(); - for(DataObject dsuseimg : dsuseimgs) { - dsuseimgPaths.add(dsuseimg.string("FILE_PATH")); - } - partition.set("dsuseimgPaths", dsuseimgPaths); - - partitions.add(partition); - } - - } - return partitions; - } - //------------------------------------------------------------------------------------------------- // 보고 문서 관리 //------------------------------------------------------------------------------------------------- @@ -617,17 +410,8 @@ public class AddsNimsController extends ApplicationController { //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- - // private method - //------------------------------------------------------------------------------------------------- - private void setCmmCode(String grpCode, ModelAndView mav){ - Map> commonCodes = getCodesOf(grpCode); - mav.addObject(grpCode, commonCodes.get(grpCode)); - } + // API server call //------------------------------------------------------------------------------------------------- - // private method - //------------------------------------------------------------------------------------------------- - - //TODO : 서버통신으로 변경 할것 @RequestMapping(value = "/getNimsBsshInfoSt.do", name="업체(마약류취급자) 검색", produces = "application/json;charset=UTF-8") public @ResponseBody ApiBaseResponse> getNimsBsshInfoSt(@ModelAttribute NimsApiRequest.BsshInfoReq dto) { String rslt = ApiUtil.callNimsApi(apiHost + bsshInfoEndpoint, dto); @@ -660,4 +444,218 @@ public class AddsNimsController extends ApplicationController { return json.parse(rslt, new TypeReference<>() {}); } + //------------------------------------------------------------------------------------------------- + // API server call + //------------------------------------------------------------------------------------------------- + + + //------------------------------------------------------------------------------------------------- + // private method + //------------------------------------------------------------------------------------------------- + private void setCmmCode(String grpCode, ModelAndView mav){ + Map> commonCodes = getCodesOf(grpCode); + mav.addObject(grpCode, commonCodes.get(grpCode)); + } + + private ModelAndView makeDisposeResultReportHwp(String dtls) { + ModelAndView mav = new ModelAndView(); + mav.setViewName("downloadView"); + + List dataForDoc = fromJson(dtls, new TypeReference>() {}); + + //출력일시,출력작업자 + Print print = new Print(); + print.setPrintRequestUserInfo(currentUser()); + print.setTempPathConfig(fileRootPath); + + //개인정보표시여부,기관장 등 + PrintOption printOption = new PrintOption(); + Map globalVariable = new HashMap(); + printOption.setGlobalVariable(globalVariable); + + + for(DataObject data : dataForDoc) { + String infKey = data.string("dscdmngId"); + String subType = data.string("dscdmngSn"); + + List fileinfo = fileService.getFileList( + new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) + ); + if(fileinfo == null) { fileinfo = new ArrayList(); } + fileinfo = fileinfo.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID"))) + .toList(); + + if(fileinfo.isEmpty()) { + data.put("filePath", ""); + } else { + data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH")); + } + + } + + //1.한글문서파일 데이터 입력 + DisposeResultReport form = new DisposeResultReport(print, printOption, dataForDoc); + //2.한글문서파일 생성 + form.makeFile(); + //3.DB 저장, 스토리지 저장 + List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { + return dataForDoc.get(i-1).string("dscdmngId"); + }).collect(Collectors.toList()); + boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; + if(allEqual) { + String resultFilePath = form.andGetPath(); + File file = new File(resultFilePath); + String newFileId = ""; + String before = ""; + boolean changeDscdmngId = false; + for(DataObject data : dataForDoc) { + if(!before.equals(data.string("dscdmngId"))) { + changeDscdmngId = true; + } else { + changeDscdmngId = false; + } + if(changeDscdmngId) { + Relation rel = new Relation().setInfoType("200").setSubType("01").setInfoKey(data.string("dscdmngId")); + FileInfo fileInfo = new FileInfo.Factory().create(rel, file); + fileInfo.setName(print.getFormatKorName()+".hwp"); + int effected = fileService.create(fileInfo); + newFileId = fileInfo.getId(); + } + } + } + //4.다운로드 + HashMap result = form.andDownload(); + mav.addAllObjects(result); + return mav; + } + + private ModelAndView makeDisposeProcessDetailsHwp(String dtls) { + ModelAndView mav = new ModelAndView(); + mav.setViewName("downloadView"); + + List dataForDoc = fromJson(dtls, new TypeReference>() {}); + + //출력일시,출력작업자 + Print print = new Print(); + print.setPrintRequestUserInfo(currentUser()); + print.setTempPathConfig(fileRootPath); + + //개인정보표시여부,기관장 등 + PrintOption printOption = new PrintOption(); + Map globalVariable = new HashMap(); + printOption.setGlobalVariable(globalVariable); + + + //제품사진 + for(DataObject data : dataForDoc) { + String infKey = data.string("dscdmngId"); + String subType = data.string("dscdmngSn"); + + List fileinfo = fileService.getFileList( + new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) + ); + if(fileinfo == null) { fileinfo = new ArrayList(); } + fileinfo = fileinfo.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID"))) + .toList(); + + if(fileinfo.isEmpty()) { + data.put("filePath", ""); + } else { + data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH")); + } + + } + + //폐기증거사진 + List partitions = this.getPartitions(dataForDoc); + + //1.한글문서파일 데이터 입력 + DisposeProcessDetails form = new DisposeProcessDetails(print, printOption, dataForDoc, partitions); + //2.한글문서파일 생성 + form.makeFile(); + //3.DB 저장, 스토리지 저장 + List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { + return dataForDoc.get(i-1).string("dscdmngId"); + }).collect(Collectors.toList()); + boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; + if(allEqual) { + String resultFilePath = form.andGetPath(); + File file = new File(resultFilePath); + String newFileId = ""; + String before = ""; + boolean changeDscdmngId = false; + for(DataObject data : dataForDoc) { + if(!before.equals(data.string("dscdmngId"))) { + changeDscdmngId = true; + } else { + changeDscdmngId = false; + } + if(changeDscdmngId) { + Relation rel = new Relation().setInfoType("200").setSubType("02").setInfoKey(data.string("dscdmngId")); + FileInfo fileInfo = new FileInfo.Factory().create(rel, file); + fileInfo.setName(print.getFormatKorName()+".hwp"); + int effected= fileService.create(fileInfo); + newFileId = fileInfo.getId(); + } + } + } + + //4.다운로드 + HashMap result = form.andDownload(); + mav.addAllObjects(result); + return mav; + } + + private List getPartitions(List dataForDoc){ + List partitions = new ArrayList<>(); + String before = ""; + boolean changeDscdmngId = false; + for(DataObject data : dataForDoc) { + if(!before.equals(data.string("dscdmngId"))) { + changeDscdmngId = true; + before = data.string("dscdmngId"); + } else { + changeDscdmngId = false; + } + + if(changeDscdmngId) { + DataObject partition = new DataObject(); + partition.set("dsuseMthNm", data.string("dsuseMthNm")); + + List dsuseimgs = fileService.getFileList( + new FileQuery().setInfoType("110").setInfoKeys(data.string("dscdmngId")) + ); + if(dsuseimgs == null) { dsuseimgs = new ArrayList(); } + dsuseimgs = dsuseimgs.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> { + int a = item1.number("SRT_ORD").intValue(); + int b = item2.number("SRT_ORD").intValue(); + return (a < b) ? -1 : ((a == b) ? 0 : 1); + }) + .toList(); + + if(dsuseimgs.isEmpty()) { + continue; + } + + List dsuseimgPaths = new ArrayList(); + for(DataObject dsuseimg : dsuseimgs) { + dsuseimgPaths.add(dsuseimg.string("FILE_PATH")); + } + partition.set("dsuseimgPaths", dsuseimgPaths); + + partitions.add(partition); + } + + } + return partitions; + } + //------------------------------------------------------------------------------------------------- + // private method + //------------------------------------------------------------------------------------------------- } From 88a89e3dd4122b4ed28cb40313ed9397ae1d1e7c Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 18 Jul 2024 09:12:43 +0900 Subject: [PATCH 2/2] =?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 @@ -