diff --git a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue
index a324807..1ea3dff 100644
--- a/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue
+++ b/frontend/src/modules/custMgt/components/ValidationConfirmPop.vue
@@ -457,7 +457,6 @@ export default {
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'none';
}
- console.log("3")
this.$parent.ChrgUpdateModal();
},
diff --git a/frontend/src/modules/custMgt/views/ChrgList.vue b/frontend/src/modules/custMgt/views/ChrgList.vue
index e7d5760..9c5832b 100644
--- a/frontend/src/modules/custMgt/views/ChrgList.vue
+++ b/frontend/src/modules/custMgt/views/ChrgList.vue
@@ -108,7 +108,7 @@ import customGrid from '@/components/CustomGrid';
import moment from 'moment';
import InsertChrgModal from '../components/InsertChrgModal';
import chrgDetailPop from '../components/ChrgDetailPop.vue';
-import commonModal from "../components/commonModal";
+import commonModal from "@/components/modal/commonModal";
import custMgtApi from '../service/custMgtApi';
class CustomATagRenderer {
@@ -293,7 +293,6 @@ export default {
if (this.startDate > this.endDate) {
this.startDate = this.endDate;
}
-
},
selectedEndDate(day) {
if (day != undefined && day != null) {
@@ -306,7 +305,7 @@ export default {
let initEndDate = new Date();
initStartDate.setMonth(Number(moment(initStartDate).format('MM')) -100)
initEndDate.setMonth(Number(moment(initEndDate).format('MM')) + 100)
-
+
if (type == 'start') {
this.disabledSDate = {to: initStartDate, from: new Date()};
@@ -356,14 +355,12 @@ export default {
if (this.doValidate()) {
this.row.title = '충전금 관리';
this.row.msg1 = '삭제 하시겠습니까?';
- // console.log("row.list", this.row.list)
this.$refs.commonModal.confirmModalOpen2(this.row);
}
},
async chrgdelete() {
try {
- // console.log("this.row",this.row)
let respose = await custMgtApi.deleteChrg(this.row);
const result = respose.data;
@@ -396,18 +393,13 @@ export default {
// return false;
// }
var chkList = this.$refs.table.checkedElementDatas();
- console.log("chkList",chkList)
- // console.log("chkList.length", chkList.length)
if (chkList.length == 0) {
this.row.title = '충전금 관리';
this.row.msg1 = '삭제대상을 체크를 해주세요.';
this.$refs.commonModal.alertModalOpen(this.row);
return false;
}
- // console.log("row.chrgSeq",this.row.chrgSeq)
const param = chkList.map((row) => ({ chrgSeq: row.chrgSeq }));
- // console.log("param",param)
- // console.log("chrgSeq",chrgSeq)
this.row.list = param;
return true;
},
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 38892ea..5593b2c 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
@@ -1011,7 +1011,7 @@ public class CustMgtService {
String nowPage = String.valueOf(chrgListReqDto.getPage());
int totalCnt = custMgtMapper.cntChrgList(chrgListReqDto);
-
+ logger.debug("getStartDt={}",chrgListReqDto.getStartDt());
if (totalCnt == 0) {
ChrgListRes chrgListRes = new ChrgListRes();
diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
index 19d787f..6ea668b 100644
--- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
@@ -1156,12 +1156,10 @@
WHERE 1 = 1
AND ecm.USE_YN ='Y'
AND esi.SUBS_STTUS_CD ='02'
-
- AND (ecm.STRT_YM = ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m')
-
-
- OR ecm.END_YM STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m'))
-
+ AND (#{startDt} BETWEEN ecm.STRT_YM AND ecm.END_YM
+ OR #{endDt} BETWEEN ecm.STRT_YM AND ecm.END_YM
+ OR ecm.STRT_YM BETWEEN #{startDt} AND #{endDt}
+ OR ecm.END_YM BETWEEN #{startDt} AND #{endDt})
AND UPPER(eci.CUST_NM) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))