jbcheong/hubez-admin
1
0
Fork 0
mirror of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin.git synced 2025-12-06 19:09:49 +09:00
Code Issues Projects Releases Wiki Activity

admin_chrg db수정

Browse Source
This commit is contained in:
won503
2023-03-30 15:44:31 +09:00
parent 68a0440688
commit 7fa6f0bf78
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/modules/custMgt/components/ValidationConfirmPop.vue
View File

@@ -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();
},

12
frontend/src/modules/custMgt/views/ChrgList.vue
View File

@@ -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;
},

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

@@ -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();

10
src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
View File

@@ -1156,12 +1156,10 @@
WHERE 1 = 1
AND ecm.USE_YN ='Y'
AND esi.SUBS_STTUS_CD ='02'
<if test="startDt != null and startDt != ''">
AND (ecm.STRT_YM <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m')
</if>
<if test="endDt != null and endDt != ''">
OR ecm.END_YM <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m'))
</if>
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})
<if test="searchType1 != null and searchType1 != ''">
<if test="searchType1 == '01' and searchText1 != null and searchText1 != ''">
AND UPPER(eci.CUST_NM) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))