From 433682ecb8b351f75658b16a786e63d0737f28ce Mon Sep 17 00:00:00 2001 From: USER Date: Wed, 10 Aug 2022 16:43:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=9B=94=EA=B8=88=EC=95=A1=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C,=20=EB=A9=94=EB=89=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/modules/riskMgt/views/All.vue | 2 +- frontend/src/modules/sysMgt/views/AuthAdd.vue | 6 ++-- .../src/modules/sysMgt/views/AuthModify.vue | 6 ++-- .../uplus/ez/api/custMgt/CustMgtService.java | 7 ++++- .../api/custMgt/dto/CarryOverListReqDto.java | 4 +++ .../api/sendNumMgt/SendNumMgtController.java | 5 ++++ .../ez/api/sendNumMgt/SendNumMgtService.java | 13 +++++++++ src/main/resources/application-dev.yml | 5 +++- src/main/resources/application-local.yml | 5 +++- src/main/resources/application-prd.yml | 5 +++- src/main/resources/application-stg.yml | 5 +++- .../mapper/mysql/comm/comm-mapper.xml | 29 ++++++++++--------- .../mapper/mysql/custMgt/custMgt-mapper.xml | 8 ++--- 13 files changed, 71 insertions(+), 29 deletions(-) diff --git a/frontend/src/modules/riskMgt/views/All.vue b/frontend/src/modules/riskMgt/views/All.vue index 706d44a..df32b43 100644 --- a/frontend/src/modules/riskMgt/views/All.vue +++ b/frontend/src/modules/riskMgt/views/All.vue @@ -36,7 +36,7 @@ diff --git a/frontend/src/modules/sysMgt/views/AuthAdd.vue b/frontend/src/modules/sysMgt/views/AuthAdd.vue index 59d34b5..895ea05 100644 --- a/frontend/src/modules/sysMgt/views/AuthAdd.vue +++ b/frontend/src/modules/sysMgt/views/AuthAdd.vue @@ -130,11 +130,11 @@ - +
@@ -197,7 +197,7 @@ export default { authCd: "", authDesc: "", stat: "01", // 등록화면 상태 Default 값 지정(사용:01) - defaultAuthMenu: ["2001", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019"], + defaultAuthMenu: ["2001", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2015", "2016", "2017", "2018", "2019"], checkedAuthMenu: [], channelAuth: "", }; diff --git a/frontend/src/modules/sysMgt/views/AuthModify.vue b/frontend/src/modules/sysMgt/views/AuthModify.vue index 5b4db6b..80c78db 100644 --- a/frontend/src/modules/sysMgt/views/AuthModify.vue +++ b/frontend/src/modules/sysMgt/views/AuthModify.vue @@ -130,11 +130,11 @@
- +
@@ -197,7 +197,7 @@ export default { authCd: "", authDesc: "", stat: "", - defaultAuthMenu: ["2001", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014", "2015", "2016", "2017", "2018", "2019"], + defaultAuthMenu: ["2001", "2004", "2005", "2006", "2007", "2008", "2009", "2010", "2011", "2012", "2013", "2015", "2016", "2017", "2018", "2019"], checkedAuthMenu: [], channelAuth: "", }; diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java index fc28c28..2954472 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java @@ -40,7 +40,11 @@ public class CustMgtService { @Autowired private HubeasyApiComponents hubeasyApi; - + + @Value("${limitCnt: 12}") + private int limitCnt; + + /** * 요금제. */ @@ -269,6 +273,7 @@ public class CustMgtService { CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class); // 이월 금액 조회. + carryOverListReqDto.setLimitCnt(limitCnt); List carryOvers = custMgtMapper.selectCarryOverList(carryOverListReqDto); // 조회 결과 없음. diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/CarryOverListReqDto.java b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/CarryOverListReqDto.java index 9dc74ff..97f7170 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/CarryOverListReqDto.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/CarryOverListReqDto.java @@ -11,5 +11,9 @@ public class CarryOverListReqDto implements Serializable { @ApiModelProperty(example = "서비스ID", name = "서비스ID", dataType = "String") private String serviceId; + + /** 조회개수 */ + @ApiModelProperty(hidden = true) + private int limitCnt; } \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java index e49ea7c..2fb46d3 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtController.java @@ -18,6 +18,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -196,4 +197,8 @@ public class SendNumMgtController { return sendNumService.updateAppr(updateApprReqDto); } + /** 제출 서류 다운로드 */ + public void downloadDoc(HttpServletRequest request, HttpServletResponse response, InsertNumberFile docFile) { + sendNumService.downloadDoc(request, response, docFile); + } } diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java index 5691fec..4f2e4d9 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java @@ -24,6 +24,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @Service public class SendNumMgtService { @@ -320,6 +323,14 @@ public class SendNumMgtService { return new InsertNumberResDto(ApiResponseCode.SUCCESS, insertNumberRes); } + // 다운로트 제출서류 + public void downloadDoc(HttpServletRequest request, HttpServletResponse response, InsertNumberFile docFile) { + + + String fileName = ""; + //FileUtil.download(request, response, sendNumUploadPath, fileName); + } + /** * date : 2022. 4. 25. * auth : ckr @@ -512,4 +523,6 @@ public class SendNumMgtService { return new UpdateApprResDto(ApiResponseCode.SUCCESS); } + + } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eb10081..82a5e8a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -72,4 +72,7 @@ file-resource: path: /efs/admin/sendNumber/ sendMsg: - tableNm: EZ_MSG_REAL \ No newline at end of file + tableNm: EZ_MSG_REAL + +# 한도 개월 수 +limitCnt: 12 \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 121de53..771258b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -72,4 +72,7 @@ file-resource: path: /efs/admin/sendNumber/ sendMsg: - tableNm: EZ_MSG_NORMAL \ No newline at end of file + tableNm: EZ_MSG_NORMAL + +# 한도 개월 수 +limitCnt: 12 \ No newline at end of file diff --git a/src/main/resources/application-prd.yml b/src/main/resources/application-prd.yml index 6bbb0be..f666f84 100644 --- a/src/main/resources/application-prd.yml +++ b/src/main/resources/application-prd.yml @@ -72,4 +72,7 @@ file-resource: path: /efs/admin/sendNumber/ sendMsg: - tableNm: EZ_MSG_NORMAL \ No newline at end of file + tableNm: EZ_MSG_NORMAL + + # 한도 개월 수 +limitCnt: 12 \ No newline at end of file diff --git a/src/main/resources/application-stg.yml b/src/main/resources/application-stg.yml index 3195a22..e1b269b 100644 --- a/src/main/resources/application-stg.yml +++ b/src/main/resources/application-stg.yml @@ -72,4 +72,7 @@ file-resource: path: /efs/admin/sendNumber/ sendMsg: - tableNm: EZ_MSG_NORMAL \ No newline at end of file + tableNm: EZ_MSG_NORMAL + + # 한도 개월 수 +limitCnt: 12 \ No newline at end of file diff --git a/src/main/resources/mapper/mysql/comm/comm-mapper.xml b/src/main/resources/mapper/mysql/comm/comm-mapper.xml index 57b2281..9382020 100644 --- a/src/main/resources/mapper/mysql/comm/comm-mapper.xml +++ b/src/main/resources/mapper/mysql/comm/comm-mapper.xml @@ -5,7 +5,7 @@ diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml index 1678587..09f4b99 100644 --- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml @@ -448,9 +448,9 @@ SELECT DATE_FORMAT(STR_TO_DATE(eul.LMT_YM ,'%Y%m'),'%Y-%m') AS LMT_YM , esu1.USER_ID AS USER_ID , (FX_LMT_AMT + CFWD_AMT) AS START_AMOUNT - , ROUND(0) AS USE_AMOUNT - , ROUND(0) AS KRRR_AMOUNT - , ROUND(0) AS EXTSH_AMOUNT + , '-' AS USE_AMOUNT + , '-' AS KRRR_AMOUNT + , '-' AS EXTSH_AMOUNT FROM hubez_admin.EZ_USER_LMT eul JOIN hubez_common.EZ_SVC_USER esu1 ON eul.USER_SEQ = esu1.USER_SEQ WHERE esu1.USER_ID =#{serviceId} and eul.LMT_YM = DATE_FORMAT(now(), '%Y%m') @@ -466,7 +466,7 @@ JOIN hubez_common.EZ_SUBS_INFO esi ON eud.SUBS_ID = esi.SUBS_ID JOIN hubez_common.EZ_SVC_USER esu ON esi.USER_SEQ = esu.USER_SEQ = DATE_ADD(NOW(), INTERVAL -4 MONTH) + AND eud.USE_YM >= DATE_ADD(NOW(), INTERVAL -#{limitCnt} MONTH) AND eud.USE_YM < NOW() ]]> AND esu.USER_ID = #{serviceId}