admin_chrg 수정,삭제부분

This commit is contained in:
2023-03-27 16:56:25 +09:00
parent 0629923f29
commit bcc10f0947
13 changed files with 589 additions and 61 deletions

View File

@@ -0,0 +1,330 @@
<template>
<div>
<!-- s: 팝업 -->
<div class="dimmed modal53"></div>
<div class="popup-wrap modal53">
<!-- 발신번호 차단 수정 -->
<div class="popup modal53 popup_form w700">
<div class="pop-head">
<h3 class="pop-tit">충전금 수정</h3>
</div>
<form autocomplete="off">
<table style="width: 100%">
<tbody>
<tr>
<th>유저 ID</th>
<td>
<input type="text" placeholder="아이디 입력" v-model.trim="userId" disabled/>
</td>
</tr>
<tr>
<th>충전월</th>
<td>
<div class="input_box cal" style="width:60%">
<div class="term">
<span class="custom_input icon_date">
<vuejs-datepicker
:language="ko"
:format="customFormatter"
:disabled-dates="disabledSDate"
:minimumView="sDateDiv"
:maximumView="sDateDiv"
v-model.trim="startDate"
@selected="selectedStartDate(0)"
@closed="closeDate('start')"
:picker-options="startDateOptions"
></vuejs-datepicker>
</span>
~
<span class="custom_input icon_date">
<vuejs-datepicker
:language="ko"
:format="customFormatter"
:disabled-dates="disabledEDate"
:minimumView="sDateDiv"
:maximumView="sDateDiv"
v-model.trim="endDate"
@selected="selectedEndDate(0)"
@closed="closeDate('end')"
:picker-options="endDateOptions"
></vuejs-datepicker>
</span>
</div>
</div>
</td>
</tr>
<tr v-show="bizrAuthYn !== 'Y'">
<th>충전금액</th>
<td>
<div class="input_add">
<input
type="radio"
name="nmineeDivCd"
value="01"
id="popup_radio5"
v-model="nmineeDivCd"
@change="changeNmineDiv($event)"
/>
<label for="popup_radio5">소멸금액</label>
<input
type="number"
placeholder="소멸 충전 금액 입력"
v-model.trim="chrgAmtE"
/>
<input
type="radio"
name="nmineeDivCd"
value="02"
id="popup_radio6"
v-model="nmineeDivCd"
@change="changeNmineDiv($event)"
/>
<label for="popup_radio6">이월금액</label>
<input
class="search-box"
type="number"
placeholder="이월 충전 금액 입력"
disabled
v-model.trim="chrgAmtC"
/>
</div>
</td>
</tr>
</tbody>
</table>
</form>
<div class="popup-btn2 pop-btn3">
<button class="btn-pcolor" @click="ChrgUpdate()">수정</button>
<button class="btn-default" @click="ChrgDetailClose()">취소</button>
<button class="btn-p2color" @click="ChrgDelete()">삭제</button>
</div>
</div>
<validation-confirm-pop ref="ValidationConfirmPop"/>
</div>
</div>
</template>
<script>
import custMgtApi from '../service/custMgtApi';
import moment from 'moment';
import ValidationConfirmPop from './ValidationConfirmPop.vue';
export default {
data(){
return{
ko: vdp_translation_ko.js,
row: {},
periodDay: 7,
sDateDiv: 'month',
startDate: new Date(),
endDate: new Date(),
startDateOptions: {disabledDate: this.disabledStDate},
endDateOptions: {disabledDate: this.disabledEdDate},
startDt: '',
endDt: '',
startYear: '',
startMonth: '',
endYear: '',
endMonth: '',
bizrAuthYn: '',
nmineeDivCd: '01',
chrgAmtE: '',
chrgAmtC: '',
userId: '',
custNm: '',
bRegNo: '',
bizrAuthYn : '',
custSeq : '',
chrgSeq : '',
useYn: '',
}
},
components: {
vuejsDatepicker,
ValidationConfirmPop,
},
created(){
this.setPeriodDay(0);
},
methods :{
// 모달 띄우기
async ChrgDetailModalOpen(props){
this.row.chrgSeq = props.chrgSeq;
try {
const response = await custMgtApi.chrgDetail(this.row);
const result = response.data;
if (result != null && result.retCode == "0000") {
this.userId = result.data.userId;
this.custNm = result.data.custNm;
let sym =result.data.strtYm.slice(0,4)+"-"+result.data.strtYm.slice(4,6)
this.startDate = sym;
let eym =result.data.endYm.slice(0,4)+"-"+result.data.endYm.slice(4,6)
this.endDate = eym;
this.chrgAmtE = result.data.chrgAmt;
this.chrgSeq = result.data.chrgSeq;
this.useYn = result.data.useYn;
}
} catch (error) {
}
var dimmed = document.getElementsByClassName('modal53');
for(var i = 0; i < dimmed.length; i++){
dimmed[i].style.display = 'block';
}
},
ChrgDetailClose(){
console.log("1")
var dimmed = document.getElementsByClassName('modal53');
for(var i = 0; i < dimmed.length; i++){
dimmed[i].style.display = 'none';
}
},
//삭제버튼
async ChrgDeleteModal(){
try {
const response = await custMgtApi.deleteChrg(this.row);
const result = response.data;
if (result != null && result.retCode == "0000") {
this.row.title = '충전금';
this.row.msg1 = '삭제하였습니다.';
this.$parent.alertInsert(this.row);
this.toComplete();
}
} catch(err) {
}
},
//수정버튼
async ChrgUpdateModal(){
try {
const response = await custMgtApi.updateChrg(this.row);
const result = response.data
if (result != null && result.retCode == "0000"){
this.row.title = '충전금';
this.row.msg1 = '수정 하였습니다.';
this.$parent.alertInsert(this.row);
this.toComplete();
}
} catch(err) {
}
},
doValidate(){
this.row.useYn=this.useYn
this.row.userId =this.userId;
this.row.custNm = this.custNm;
this.row.strtYm = this.startDate;
this.row.endYm = this.endDate;
this.row.chrgAmt = this.chrgAmtE;
this.row.chrgSeq = this.chrgSeq;
return true;
},
ChrgUpdate(){
if (this.doValidate()) {
this.$refs.ValidationConfirmPop.chrgconfirmUpdateOpen();
}
},
ChrgDelete(){
if(this.doValidate()){
this.$refs.ValidationConfirmPop.chrgconfirmDeleteOpen();
}
},
toComplete(){
console.log("8")
this.$parent.$refs.table.reloadData();
this.ChrgDetailClose();
},
// 모달 끄기
ModalClose(){
var dimmed = document.getElementsByClassName('dimmed');
dimmed[0].style.display = 'none';
var wrap = document.getElementsByClassName('popup-wrap');
wrap[0].style.display = 'none';
var popup = document.getElementsByClassName('modal53');
popup[0].style.display = 'none';
},
//달력 셋팅
setPeriodDay(day) {
this.periodDay = day;
this.endDate = new Date();
this.initSetStartDate();
this.initSetEndDate();
this.closeDate('start');
this.closeDate('end');
},
selectedStartDate(day) {
if (day != undefined && day != null) {
this.periodDay = day;
}
if (this.startDate > this.endDate) {
this.startDate = this.endDate;
}
},
selectedEndDate(day) {
if (day != undefined && day != null) {
this.periodDay = day;
}
},
closeDate(type) {
if (type != undefined && type != null) {
let initStartDate = new Date();
let initEndDate = new Date();
initStartDate.setMonth(Number(moment(initStartDate).format('MM')) )
initEndDate.setMonth(Number(moment(initEndDate).format('MM')) +12)
if (type == 'start') {
this.disabledSDate = {to: initStartDate, from: new Date()};
if (this.startDate !== initStartDate) {
this.disabledEDate = {to: this.startDate, from: initEndDate};
}
} else if (type == 'end') {
this.disabledEDate = {to: initStartDate, from: initEndDate};
if (this.endDate !== initEndDate) {
this.disabledSDate = {from: this.endDate};
this.disabledSDate = {to: initStartDate, from: initEndDate};
}
}
}
},
customFormatter: function (date) {
if (this.sDateDiv == 'month') {
return moment(date).format('YYYY-MM');
} else if (this.sDateDiv == 'year') {
return moment(date).format('YYYY');
} else {
return moment(date).format('YYYY-MM-DD');
}
},
gridParamSet() {
this.grid.params = {
startMonth: moment(this.startDate).format('YYYYMM'),
endMonth: moment(this.endDate).format('YYYYMM'),
}
},
initSetStartDate() {
let initStartDate = new Date();
initStartDate.setMonth(Number(moment(initStartDate).format('MM')) );
this.startDate = initStartDate;
},
initSetEndDate() {
let initEndDate = new Date();
initEndDate.setMonth(Number(moment(initEndDate).format('MM')) +12);
this.endDate = initEndDate;
},
}
}
</script>

View File

@@ -144,6 +144,7 @@ export default {
bRegNo: '', bRegNo: '',
bizrAuthYn : '', bizrAuthYn : '',
custSeq : '', custSeq : '',
chrgSeq : '',
} }
}, },
@@ -219,8 +220,8 @@ export default {
if (type != undefined && type != null) { if (type != undefined && type != null) {
let initStartDate = new Date(); let initStartDate = new Date();
let initEndDate = new Date(); let initEndDate = new Date();
initStartDate.setMonth(Number(moment(initStartDate).format('MM')) - 4) initStartDate.setMonth(Number(moment(initStartDate).format('MM')) )
initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 2) initEndDate.setMonth(Number(moment(initEndDate).format('MM')) + 12)
if (type == 'start') { if (type == 'start') {
@@ -255,32 +256,21 @@ export default {
}, },
initSetStartDate() { initSetStartDate() {
let initStartDate = new Date(); let initStartDate = new Date();
initStartDate.setMonth(Number(moment(initStartDate).format('MM')) - 4); initStartDate.setMonth(Number(moment(initStartDate).format('MM')));
this.startDate = initStartDate; this.startDate = initStartDate;
}, },
initSetEndDate() { initSetEndDate() {
let initEndDate = new Date(); let initEndDate = new Date();
initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 2); initEndDate.setMonth(Number(moment(initEndDate).format('MM')) +12);
this.endDate = initEndDate; this.endDate = initEndDate;
}, },
saveChrg(){ saveChrg(){
// this.saveChrg = [];
// this.saveChrg.push({
// userId: this.userId,
// strtYm: this.strtYm,
// endYm: this.endDate,
// chrgAmt: this.chrgAmt,
// })
// let startDate2 = this.startDate.toString()
console.log("this.userId: ", this.userId) console.log("this.userId: ", this.userId)
console.log("this.startDate: ", this.startDate) console.log("this.startDate: ", this.startDate)
console.log("this.endDate: ", this.endDate) console.log("this.endDate: ", this.endDate)
console.log("this.chrgAmtE: ", this.chrgAmtE) console.log("this.chrgAmtE: ", this.chrgAmtE)
// startDate2 = startDate2.replace(/{{/g, '')
// console.log("chstartDate",chstartDate)
let param = { let param = {
userId : this.userId, userId : this.userId,
strtYm : this.startDate, strtYm : this.startDate,
@@ -295,7 +285,7 @@ export default {
if (result.success) { if (result.success) {
alert("충전금이 등록되었습니다."); alert("충전금이 등록되었습니다.");
} else { } else {
alert("오류가 발생하였습니다"); // alert("오류가 발생하였습니다");
} }
}) })
}, },

View File

@@ -161,6 +161,41 @@
</div> </div>
</div> </div>
<!-- 충전금 상세 - 수정 -->
<div class="dimmed chrgconfirm-update" @click="chrgconfirmUpdateClose();"></div>
<div class="popup-wrap chrgconfirm-update">
<div class="popup chrgconfirm-update">
<div class="pop-head">
<h3 class="pop-tit">충전금 상세</h3>
</div>
<div class="pop-cont">
<p>작성된 내용으로 수정하겠습니까?</p>
</div>
<div class="popup-btn2">
<button class="btn-pcolor" @click="chrgconfirmUpdate();">확인</button>
<button class="btn-default" @click="chrgconfirmUpdateClose();">취소</button>
</div>
</div>
</div>
<!-- 충전금 상세 삭제-->
<div class="dimmed chrgconfirm-delete" @click="chrgconfirmDeleteClose();"></div>
<div class="popup-wrap chrgconfirm-delete">
<div class="popup chrgconfirm-delete">
<div class="pop-head">
<h3 class="pop-tit">충전금 상세</h3>
</div>
<div class="pop-cont">
<p>해당 충전금을 리스트에서</p>
<p>삭제하시겠습니까?</p>
</div>
<div class="popup-btn2">
<button class="btn-pcolor" @click="chrgconfirmDelete();">확인</button>
<button class="btn-default" @click="chrgconfirmDeleteClose();">취소</button>
</div>
</div>
</div>
</div> </div>
</template> </template>
@@ -407,6 +442,59 @@ export default {
// 부모 함수 호출. // 부모 함수 호출.
this.$parent.confirmCalbackFnc(this.row); this.$parent.confirmCalbackFnc(this.row);
}, },
//충전금 수정 확인 Open
chrgconfirmUpdateOpen() {
var dimmed = document.getElementsByClassName('chrgconfirm-update');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'block';
}
},
//충전금 수정 확인
chrgconfirmUpdate() {
var dimmed = document.getElementsByClassName('chrgconfirm-update');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'none';
}
console.log("3")
this.$parent.ChrgUpdateModal();
},
// 충전금 수정 Close
chrgconfirmUpdateClose() {
var dimmed = document.getElementsByClassName('chrgconfirm-update');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'none';
}
},
// 충전금 삭제 Open
chrgconfirmDeleteOpen() {
var dimmed = document.getElementsByClassName('chrgconfirm-delete');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'block';
}
},
//충전금 삭제
chrgconfirmDelete() {
var dimmed = document.getElementsByClassName('chrgconfirm-delete');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'none';
}
this.$parent.ChrgDeleteModal();
},
//충전금 삭제 Close
chrgconfirmDeleteClose() {
var dimmed = document.getElementsByClassName('chrgconfirm-delete');
for (var i = 0; i < dimmed.length; i++) {
dimmed[i].style.display = 'none';
}
},
} }
} }
</script> </script>

View File

@@ -93,11 +93,21 @@ const insertChrg = (params) => {
return httpClient.post('/api/v1/bo/custMgt/insertChrg', params); return httpClient.post('/api/v1/bo/custMgt/insertChrg', params);
} }
// 충전금 생성
const chrgDetail = (params) => {
return httpClient.post('/api/v1/bo/custMgt/chrgDetail', params);
}
// 충전금 수정 // 충전금 수정
const updateChrg = (params) => { const updateChrg = (params) => {
return httpClient.post('/api/v1/bo/custMgt/updateChrg', params); return httpClient.post('/api/v1/bo/custMgt/updateChrg', params);
} }
// 충전금 삭제
const deleteChrg = (params) => {
return httpClient.post('/api/v1/bo/custMgt/deleteChrg', params);
}
const getExcelHeader = category => { const getExcelHeader = category => {
// 엑셀에 출력할 Header 정보를 Mockup 데이터로 관리한다. // 엑셀에 출력할 Header 정보를 Mockup 데이터로 관리한다.
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
@@ -141,4 +151,6 @@ export default {
chrgList, chrgList,
insertChrg, insertChrg,
updateChrg, updateChrg,
chrgDetail,
deleteChrg,
} }

View File

@@ -97,6 +97,7 @@
</div> </div>
<insert-chrg-modal ref="insertChrgModal"></insert-chrg-modal> <insert-chrg-modal ref="insertChrgModal"></insert-chrg-modal>
<chrg-detail-pop ref="chrgDetailPop" /> <chrg-detail-pop ref="chrgDetailPop" />
<common-modal ref="commonModal" />
</div> </div>
</div> </div>
</template> </template>
@@ -107,6 +108,7 @@ import customGrid from '@/components/CustomGrid';
import moment from 'moment'; import moment from 'moment';
import InsertChrgModal from '../components/InsertChrgModal'; import InsertChrgModal from '../components/InsertChrgModal';
import chrgDetailPop from '../components/ChrgDetailPop.vue'; import chrgDetailPop from '../components/ChrgDetailPop.vue';
import commonModal from "@/components/modal/commonModal";
class CustomATagRenderer { class CustomATagRenderer {
constructor(props) { constructor(props) {
@@ -149,7 +151,10 @@ export default {
endYear: '', endYear: '',
endMonth: '', endMonth: '',
searchType1: '01', searchType1: '01',
chrgSeq : '',
useYn: '',
// 테이블 리스트 데이터 // 테이블 리스트 데이터
perPageCnt: 50, perPageCnt: 50,
@@ -168,6 +173,7 @@ export default {
addCls: 'box_OFvis', addCls: 'box_OFvis',
columns:[ columns:[
{name: 'chrgSeq', header: 'chrgSeq', align: 'center', width: 60},
{name: 'no', header: 'No', align: 'center', width: 60}, {name: 'no', header: 'No', align: 'center', width: 60},
{ {
name: 'custNm', header: '고객사명', align: 'center', width: 130, name: 'custNm', header: '고객사명', align: 'center', width: 130,
@@ -193,6 +199,7 @@ export default {
vuejsDatepicker, vuejsDatepicker,
InsertChrgModal, InsertChrgModal,
chrgDetailPop, chrgDetailPop,
commonModal,
}, },
created() { created() {
this.setPeriodDay(0); this.setPeriodDay(0);
@@ -342,7 +349,11 @@ export default {
insertChrg () { insertChrg () {
this.$refs.insertChrgModal.insertChrgOpen(); this.$refs.insertChrgModal.insertChrgOpen();
} },
alertInsert(props) {
this.$refs.commonModal.alertModalOpen(props);
},
} }
} }
</script> </script>

View File

@@ -1039,6 +1039,25 @@ public class CustMgtService {
return new ChrgListResDto(ApiResponseCode.SUCCESS, chrgListRes); return new ChrgListResDto(ApiResponseCode.SUCCESS, chrgListRes);
} }
/**
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 상세 조회
* @param ChrgDetailReqDto
* @return ChrgDetailResDto
*/
public ChrgDetailResDto chrgDetail(@Valid ChrgDetailReqDto chrgDetailReqDto) {
CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class);
ChrgDetail chrgDetail = custMgtMapper.selectChrgDetail(chrgDetailReqDto);
if (chrgDetail == null) {
return new ChrgDetailResDto(ApiResponseCode.CM_NOT_FOUND);
}
// 성공 응답.
return new ChrgDetailResDto(ApiResponseCode.SUCCESS, chrgDetail);
}
/** /**
* * date : 2023. 3. 15. * * date : 2023. 3. 15.
@@ -1088,7 +1107,7 @@ public class CustMgtService {
chrgInfo.setChrgDiv(insertChrgReqDto.getChrdDiv()); chrgInfo.setChrgDiv(insertChrgReqDto.getChrdDiv());
String StrYm = insertChrgReqDto.getStrtYm().replace("-", "").substring(0, 6); String StrYm = insertChrgReqDto.getStrtYm().replace("-", "").substring(0, 6);
chrgInfo.setStrtYm(StrYm); chrgInfo.setStrtYm(StrYm);
String EndYm = insertChrgReqDto.getEndYm().substring(0, 6); String EndYm = insertChrgReqDto.getEndYm().replace("-", "").substring(0, 6);
chrgInfo.setEndYm(EndYm); chrgInfo.setEndYm(EndYm);
chrgInfo.setChrgAmt(insertChrgReqDto.getChrgAmt()); chrgInfo.setChrgAmt(insertChrgReqDto.getChrgAmt());
chrgInfo.setRegId(regId); //로그인 ID chrgInfo.setRegId(regId); //로그인 ID
@@ -1114,21 +1133,21 @@ public class CustMgtService {
custMgtMapper.updateChrg(updateChrgReqDto); custMgtMapper.updateChrg(updateChrgReqDto);
// 2. 새 정보 insert // 2. 새 정보 insert
String chrgSeq = custMgtMapper.getChrgSeq(); String chrgSeq = custMgtMapper.getChrgSeq();
int userSeq = custMgtMapper.selectUserSeq(updateChrgReqDto.getUserId()); int userSeq = custMgtMapper.selectUserSeq(updateChrgReqDto.getUserId());
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
UserDetails userDetails = (UserDetails) principal; UserDetails userDetails = (UserDetails) principal;
String regId = userDetails.getUsername(); String regId = userDetails.getUsername();
logger.debug("insertChrgReqDto= {}", updateChrgReqDto); logger.debug("updateChrgReqDto= {}", updateChrgReqDto);
ChrgInfo chrgInfo = new ChrgInfo(); ChrgInfo chrgInfo = new ChrgInfo();
chrgInfo.setChrgSeq(chrgSeq); chrgInfo.setChrgSeq(chrgSeq);
chrgInfo.setUserSeq(userSeq); chrgInfo.setUserSeq(userSeq);
chrgInfo.setChrgDiv(updateChrgReqDto.getChrdDiv()); chrgInfo.setChrgDiv(updateChrgReqDto.getChrdDiv());
String StrYm = updateChrgReqDto.getStrtYm().substring(0, 6); String StrYm = updateChrgReqDto.getStrtYm().replace("-", "").substring(0, 6);
chrgInfo.setStrtYm(StrYm); chrgInfo.setStrtYm(StrYm);
String EndYm = updateChrgReqDto.getEndYm().substring(0, 6); String EndYm = updateChrgReqDto.getEndYm().replace("-", "").substring(0, 6);
chrgInfo.setEndYm(EndYm); chrgInfo.setEndYm(EndYm);
chrgInfo.setChrgAmt(updateChrgReqDto.getChrgAmt()); chrgInfo.setChrgAmt(updateChrgReqDto.getChrgAmt());
chrgInfo.setRegId(regId); //로그인 ID chrgInfo.setRegId(regId); //로그인 ID
@@ -1152,25 +1171,7 @@ public class CustMgtService {
return new DeleteChrgResDto(ApiResponseCode.SUCCESS); return new DeleteChrgResDto(ApiResponseCode.SUCCESS);
} }
/**
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 상세 조회
* @param ChrgDetailReqDto
* @return ChrgDetailResDto
*/
public ChrgDetailResDto chrgDetail(@Valid ChrgDetailReqDto chrgDetailReqDto) {
CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class);
ChrgDetail chrgDetail = custMgtMapper.selectChrgDetail(chrgDetailReqDto);
if (chrgDetail == null) {
return new ChrgDetailResDto(ApiResponseCode.CM_NOT_FOUND);
}
// 성공 응답.
return new ChrgDetailResDto(ApiResponseCode.SUCCESS, chrgDetail);
}
/* 2023-03-07 add request 부분 /* 2023-03-07 add request 부분
* date : 2023. 1. 1. * date : 2023. 1. 1.

View File

@@ -0,0 +1,30 @@
package kr.co.uplus.ez.api.custMgt.dto;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@SuppressWarnings("serial")
@Data
public class ChrgDetail implements Serializable{
@ApiModelProperty(example = "고객사명", name = "고객사명", dataType = "String")
private String custNm;
@ApiModelProperty(example = "고객명", name = "고객명", dataType = "String")
private String userId;
@ApiModelProperty(example = "충전구분", name = "충전구분", dataType = "String")
private String chrgDiv;
@ApiModelProperty(example = "충전시작일", name = "충전시작일", dataType = "String")
private String strtYm;
@ApiModelProperty(example = "충전종료일", name = "충전종료일", dataType = "String")
private String endYm;
@ApiModelProperty(example = "충전금액", name = "충전금액", dataType = "String")
private String chrgAmt;
@ApiModelProperty(example = "사용여부", name = "사용여부", dataType = "String")
private String useYn;
@ApiModelProperty(example = "사업자명", name = "사업자명", dataType = "String")
private String bizrNo;
@ApiModelProperty(example = "충전seq", name = "충전seq", dataType = "String")
private String chrgSeq;
}

View File

@@ -0,0 +1,14 @@
package kr.co.uplus.ez.api.custMgt.dto;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@SuppressWarnings("serial")
@Data
public class ChrgDetailReqDto implements Serializable{
@ApiModelProperty(example = "충전seq", name = "충전seq", dataType = "String")
private String chrgSeq;
}

View File

@@ -0,0 +1,33 @@
package kr.co.uplus.ez.api.custMgt.dto;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import kr.co.uplus.ez.common.data.ApiResponseCode;
import kr.co.uplus.ez.common.data.ResponseMessage;
import lombok.Data;
@SuppressWarnings("serial")
@Data
public class ChrgDetailResDto extends ResponseMessage implements Serializable{
@ApiModelProperty(example = "데이터")
private ChrgDetail data;
public ChrgDetailResDto() {
this.retCode = ApiResponseCode.SUCCESS.getResultCode();
this.retMsg = ApiResponseCode.SUCCESS.getResultMsg();
}
public ChrgDetailResDto(ApiResponseCode returnStr) {
this.retCode = returnStr.getResultCode();
this.retMsg = returnStr.getResultMsg();
}
public ChrgDetailResDto(ApiResponseCode returnStr, ChrgDetail data) {
this.retCode = returnStr.getResultCode();
this.retMsg = returnStr.getResultMsg();
this.data = data;
}
}

View File

@@ -28,5 +28,7 @@ public class ChrgList implements Serializable{
private String bizrNo; private String bizrNo;
@ApiModelProperty(example = "충전기간", name = "충전기간", dataType = "String") @ApiModelProperty(example = "충전기간", name = "충전기간", dataType = "String")
private String chrgDate; private String chrgDate;
@ApiModelProperty(example = "충전seq", name = "충전seq", dataType = "String")
private String chrgSeq;
} }

View File

@@ -11,5 +11,7 @@ public class DeleteChrgReqDto implements Serializable{
@ApiModelProperty(example = "사용여부", name = "사용여부", dataType = "String") @ApiModelProperty(example = "사용여부", name = "사용여부", dataType = "String")
private String useYn; private String useYn;
@ApiModelProperty(example = "충전seq", name = "충전seq", dataType = "String")
private String chrgSeq;
} }

View File

@@ -25,5 +25,7 @@ public class UpdateChrgReqDto implements Serializable{
private String useYn; private String useYn;
@ApiModelProperty(example = "사업자명", name = "사업자명", dataType = "String") @ApiModelProperty(example = "사업자명", name = "사업자명", dataType = "String")
private String bizrNo; private String bizrNo;
@ApiModelProperty(example = "충전seq", name = "충전seq", dataType = "String")
private String chrgSeq;
} }

View File

@@ -1148,10 +1148,6 @@
<select id="selectChrgList" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgListReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgList"> <select id="selectChrgList" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgListReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgList">
SELECT SELECT
@ROWNUM := @ROWNUM + 1 AS NO @ROWNUM := @ROWNUM + 1 AS NO
,A.*
FROM (
SELECT
@ROWNUM := @ROWNUM + 1 AS NO
, eci.CUST_NM , eci.CUST_NM
, esu.USER_ID , esu.USER_ID
, ecm.CHRG_DIV , ecm.CHRG_DIV
@@ -1160,6 +1156,7 @@
, ecm.CHRG_AMT , ecm.CHRG_AMT
, ecm.USE_YN , ecm.USE_YN
, eci.BIZRNO , eci.BIZRNO
, ecm.CHRG_SEQ
FROM hubez_admin.EZ_CHARGE_MNG ecm FROM hubez_admin.EZ_CHARGE_MNG ecm
INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ
@@ -1167,10 +1164,10 @@
WHERE 1 = 1 WHERE 1 = 1
AND ecm.USE_YN ='Y' AND ecm.USE_YN ='Y'
<if test="startDt != null and startDt != ''"> <if test="startDt != null and startDt != ''">
AND ecm.STRT_YM <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m') AND (ecm.STRT_YM <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m')
</if> </if>
<if test="endDt != null and endDt != ''"> <if test="endDt != null and endDt != ''">
OR ecm.END_YM <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m') OR ecm.END_YM <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m'))
</if> </if>
<if test="searchType1 != null and searchType1 != ''"> <if test="searchType1 != null and searchType1 != ''">
<if test="searchType1 == '01' and searchText1 != null and searchText1 != ''"> <if test="searchType1 == '01' and searchText1 != null and searchText1 != ''">
@@ -1183,13 +1180,28 @@
AND UPPER(esu.USER_ID) LIKE UPPER(CONCAT('%', #{searchText1}, '%')) AND UPPER(esu.USER_ID) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if> </if>
</if> </if>
ORDER BY esu.USER_ID DESC) A , ORDER BY ecm.CHRG_SEQ DESC
( SELECT @ROWNUM := #{page} ) AS R
</select> </select>
<!-- 충전관리 상세 조회 --> <!-- 충전관리 상세 조회 -->
<select id="selectChrgDetail" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgDetailReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgDetail"> <select id="selectChrgDetail" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgDetailReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgDetail">
SELECT
eci.CUST_NM
, esu.USER_ID
, ecm.CHRG_DIV
, ecm.STRT_YM
, ecm.END_YM
, ecm.CHRG_AMT
, ecm.USE_YN
, eci.BIZRNO
, ecm.CHRG_SEQ
FROM hubez_admin.EZ_CHARGE_MNG ecm
INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ
INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ
WHERE 1 = 1
AND ecm.USE_YN ='Y'
AND ecm.CHRG_SEQ = #{chrgSeq}
ORDER BY ecm.CHRG_SEQ DESC
</select> </select>
<!-- 이용자 충전번호 조회(채번) --> <!-- 이용자 충전번호 조회(채번) -->
@@ -1228,10 +1240,11 @@
</insert> </insert>
<update id="updateChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo"> <update id="updateChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
hubez_admin.EZ_CHARGE_MNG UPDATE
set hubez_admin.EZ_CHARGE_MNG ecm
ecm.USE_YN ='N' set
WHERE USER_SEQ = (SELECT USER_SEQ FROM hubez_common.EZ_SVC_USER WHERE USER_ID = #{userId}) ecm.USE_YN ='N'
WHERE ecm.CHRG_SEQ = #{chrgSeq}
</update> </update>
<insert id="addChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo"> <insert id="addChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
@@ -1247,27 +1260,27 @@
, REG_DT , REG_DT
, CHG_ID , CHG_ID
, CHG_DT , CHG_DT
)
) VALUES( ) VALUES(
#{chrgSeq} #{chrgSeq}
, #{userSeq} , #{userSeq}
, 'Y' , 'E'
, #{startDt} , #{strtYm}
, #{endDt} , #{endYm}
, #{chrgAmt} , #{chrgAmt}
, 'Y'
, #{regId} , #{regId}
, NOW() , NOW()
, #{regId} , #{regId}
, NOW() , NOW()
) )
</insert> </insert>
<update id="deleteChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo"> <update id="deleteChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
UPDATE UPDATE
hubez_admin.EZ_CHARGE_MNG hubez_admin.EZ_CHARGE_MNG ecm
set set
ecm.USE_YN ='N' ecm.USE_YN ='N'
WHERE USER_SEQ = (SELECT USER_SEQ FROM hubez_common.EZ_SVC_USER WHERE USER_ID = #{userId}) WHERE ecm.CHRG_SEQ = #{chrgSeq}
</update> </update>