이월금액 조회, 메뉴 수정

frontend/src/modules/riskMgt/views/All.vue

@@ -36,7 +36,7 @@
               <select name="" id="" v-model="blckTpCd">
                 <option value="" selected>전체</option>
                 <option value="01">발신번호차단</option>
-                <option value="02">메시지차단</option>
+                <!-- <option value="02">메시지차단</option> -->
                 <option value="03">080수신번호차단</option>
               </select>
             </div>

frontend/src/modules/sysMgt/views/AuthAdd.vue

@@ -130,11 +130,11 @@
             <label for="right_check13"></label>
             <label for="right_check13">080수신번호 차단</label>
           </div>
-          <input type="checkbox" id="right_check14" value="2014" v-model="checkedAuthMenu">
+          <!-- <input type="checkbox" id="right_check14" value="2014" v-model="checkedAuthMenu">
           <div class="label_group">
             <label for="right_check14"></label>
             <label for="right_check14">메시지 차단</label>
-          </div>
+          </div> -->
           <input type="checkbox" id="right_check15" value="2015" v-model="checkedAuthMenu">
           <div class="label_group">
             <label for="right_check15"></label>
@@ -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: "",
     };

frontend/src/modules/sysMgt/views/AuthModify.vue

@@ -130,11 +130,11 @@
             <label for="right_check13"></label>
             <label for="right_check13">080수신번호 차단</label>
           </div>
-          <input type="checkbox" id="right_check14" value="2014" v-model="checkedAuthMenu">
+          <!-- <input type="checkbox" id="right_check14" value="2014" v-model="checkedAuthMenu">
           <div class="label_group">
             <label for="right_check14"></label>
             <label for="right_check14">메시지 차단</label>
-          </div>
+          </div> -->
           <input type="checkbox" id="right_check15" value="2015" v-model="checkedAuthMenu">
           <div class="label_group">
             <label for="right_check15"></label>
@@ -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: "",
     };

src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java

@@ -41,6 +41,10 @@ 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<CarryOver> carryOvers = custMgtMapper.selectCarryOverList(carryOverListReqDto);
 
         // 조회 결과 없음.

src/main/java/kr/co/uplus/ez/api/custMgt/dto/CarryOverListReqDto.java

@@ -12,4 +12,8 @@ public class CarryOverListReqDto implements Serializable {
 	@ApiModelProperty(example = "서비스ID", name = "서비스ID", dataType = "String")
 	private String serviceId;
 	
+	/** 조회개수 */
+	@ApiModelProperty(hidden = true)
+	private int limitCnt;
+
 }

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);
+	}
 }

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);
 	}
 
+	
+
 }

src/main/resources/application-dev.yml

@@ -73,3 +73,6 @@ file-resource:
 
 sendMsg:
   tableNm: EZ_MSG_REAL
+  
+# 한도 개월 수   
+limitCnt: 12

src/main/resources/application-local.yml

@@ -73,3 +73,6 @@ file-resource:
 
 sendMsg:
   tableNm: EZ_MSG_NORMAL
+  
+# 한도 개월 수   
+limitCnt: 12

src/main/resources/application-prd.yml

@@ -73,3 +73,6 @@ file-resource:
 
 sendMsg:
   tableNm: EZ_MSG_NORMAL
+  
+ # 한도 개월 수   
+limitCnt: 12

src/main/resources/application-stg.yml

@@ -73,3 +73,6 @@ file-resource:
 
 sendMsg:
   tableNm: EZ_MSG_NORMAL
+  
+ # 한도 개월 수   
+limitCnt: 12

src/main/resources/mapper/mysql/comm/comm-mapper.xml

@@ -5,7 +5,7 @@
 
 	<select id="getMenuByRole" parameterType="string" resultType="kr.co.uplus.ez.api.comm.dto.Menu">
 		/* comm-mapper.xml(getMenuByRole) */
-		select eam2.MENU_NO as menuNo 
+		SELECT eam2.MENU_NO as menuNo 
 		   , null  as prntsMenuNo
 		   , eam2.MENU_NM  as menuNm
 		   , eam2.MENU_ODRG as menuOdrg
@@ -13,14 +13,15 @@
 		   , eam2.AUTCHK_GRPNO as autchkGrpno
 		   , eam2.MENU_LVL as menuLvl
 		   , eam2.MENU_URL as menuUrl
-		from hubez_admin.EZ_ADM_AUTMENU eaa 
+		FROM hubez_admin.EZ_ADM_AUTMENU eaa 
-		   inner join hubez_admin.EZ_ADM_MENU eam 
+		   INNER JOIN hubez_admin.EZ_ADM_MENU eam 
 		      on eam.MENU_NO = eaa.MENU_NO 
-		   inner join hubez_admin.EZ_ADM_MENU eam2 
+		   INNER JOIN hubez_admin.EZ_ADM_MENU eam2 
-		      on eam2.MENU_NO = eam.PRNTS_MENU_NO 
+		      ON eam2.MENU_NO = eam.PRNTS_MENU_NO 
-		where AUT_CD = #{role}
+		WHERE AUT_CD = #{role}
+			AND eam.USE_YN = 'Y'
 		UNION 
-		select eam.MENU_NO as menuNo 
+		SELECT eam.MENU_NO as menuNo 
 		   , eam.PRNTS_MENU_NO  as prntsMenuNo
 		   , eam.MENU_NM  as menuNm
 		   , eam.MENU_ODRG as menuOdrg
@@ -28,12 +29,14 @@
 		   , eam.AUTCHK_GRPNO as autchkGrpno
 		   , eam.MENU_LVL as menuLvl
 		   , eam.MENU_URL as menuUrl
-		from hubez_admin.EZ_ADM_AUTMENU eaa 
+		FROM hubez_admin.EZ_ADM_AUTMENU eaa 
-		   inner join hubez_admin.EZ_ADM_MENU eam 
+		   INNER JOIN hubez_admin.EZ_ADM_MENU eam 
-		      on eam.MENU_NO = eaa.MENU_NO 
+		      ON eam.MENU_NO = eaa.MENU_NO 
-		   inner join hubez_admin.EZ_ADM_MENU eam2 
+		   INNER JOIN hubez_admin.EZ_ADM_MENU eam2 
-		      on eam2.MENU_NO = eam.PRNTS_MENU_NO 
+		      ON eam2.MENU_NO = eam.PRNTS_MENU_NO 
-		where AUT_CD = #{role}
+		WHERE AUT_CD = #{role}
+			AND eam.USE_YN = 'Y'
+			AND	eam2.USE_YN = 'Y'
 		ORDER BY menuLvl, menuOdrg;
 	</select>
 

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
+         , '-' AS USE_AMOUNT
-         , ROUND(0) AS KRRR_AMOUNT
+         , '-' AS KRRR_AMOUNT
-         , ROUND(0) AS EXTSH_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
       <![CDATA[
-      AND eud.USE_YM >= 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}