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

admin_chrg 등록

Browse Source
This commit is contained in:
won503
2023-03-24 17:28:43 +09:00
parent 6fa5c4d20b
commit 01a265c17d
12 changed files with 199 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtController.java
View File

@@ -494,8 +494,8 @@ public class CustMgtController {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 목록 조회
* @param
* @return
* @param ChrgListReqDto
* @return ChrgListResDto
* @
*/
@ApiOperation(value="chrgList", notes = "충전관리 목록 조회")
@@ -537,8 +537,8 @@ public class CustMgtController {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 수정
* @param UpdateChrgReqDto
* @return UpdateChrgResDto
* @param paramMap
* @return
*/
@ApiOperation(value="updateChrg", notes = "충전관리 수정")
@ApiResponses({
@@ -557,8 +557,8 @@ public class CustMgtController {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 삭제
* @param DeleteChrgReqDto
* @return DeleteChrgResDto
* @param paramMap
* @return
*/
@ApiOperation(value="deleteChrg", notes = "충전관리 수정")
@ApiResponses({

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

@@ -22,6 +22,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -1003,16 +1004,38 @@ public class CustMgtService {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 목록 조회
* @param
* @return
* @param ChrgListReqDto
* @return ChrgListResDto
*/
public ChrgListResDto chrgList(ChrgListReqDto chrgListReqDto) {
CustMgtMapper custMgtMapper = sqlSessionMaster.getMapper(CustMgtMapper.class);
List<ChrgList> chrgList= custMgtMapper.selectChrgList(chrgListReqDto);
//for문
//1. 시작일을 가져온다
//2. 종료일을 가져온다
//3. 기간이라는 변수에 담아준다(형태를 잡아야함)"시작일"add String "~" add"종료일"(리스트,
for (int i = 0; i < chrgList.size(); i++) {
String startDt = chrgList.get(i).getStrtYm();
String endDt = chrgList.get(i).getEndYm();
logger.debug("startDt={} ", startDt);
logger.debug("endDt={} ", endDt);
// String chrgDate = startDt + "~" +endDt ;
chrgList.get(i).setChrgDate(startDt + "~" +endDt);
// logger.debug("chrgDate={} ", chrgDate);
}
ChrgListRes chrgListRes = new ChrgListRes();
chrgListRes.setList(chrgList);
logger.debug("chrgList={}",chrgList);
return new ChrgListResDto(ApiResponseCode.SUCCESS, chrgListRes);
}
@@ -1021,46 +1044,52 @@ public class CustMgtService {
* * date : 2023. 3. 15.
* * auth : won
* * desc : 충전관리 등록
* @param insertChrgReqDto
* @param paramMap
* @return
*/
public InsertChrgResDto InsertChrg(@Valid InsertChrgReqDto insertChrgReqDto) {
CustMgtMapper custMgtMapper = sqlSessionMaster.getMapper(CustMgtMapper.class);
// // 1. 사용자 유무 확인
// int getUserIdCount = custMgtMapper.getUserIdCount(insertChrgReqDto.getUserId());
//
// if (getUserIdCount < 1) {
// return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
// }
int getUserIdCount = custMgtMapper.getUserIdCount(insertChrgReqDto.getUserId());
if (getUserIdCount < 1) {
return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
}
// 1. 사용자 유무 확인
SvcUserInfo svcUserInfo = custMgtMapper.selectSvcUserInfo(insertChrgReqDto.getUserId());
if (svcUserInfo == null) {
return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
}
// SvcUserInfo svcUserInfo = custMgtMapper.selectSvcUserInfo(insertChrgReqDto.getUserId());
//
// if (svcUserInfo == null) {
// return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
// }
//
// // 2. 관리자 ID 존재 여부 체크.
// SvcUserInfo svcUserInfo = custMgtMapper.selectSvcUserInfo(insertChrgReqDto.getUserId());
//
// if (svcUserInfo == null) {
// return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
// }
//
// 2. 관리자 ID 존재 여부 체크.
SvcUserInfo svcadmUserInfo = custMgtMapper.selectSvcUserInfo(insertChrgReqDto.getAdminId());
if (svcadmUserInfo == null) {
return new InsertChrgResDto(ApiResponseCode.CM_NOT_FOUND);
}
// 3. 충전 정보 등록
String chrgSeq = custMgtMapper.getChrgSeq();
String userSeq = custMgtMapper.getUserSeq();
int userSeq = custMgtMapper.selectUserSeq(insertChrgReqDto.getUserId());
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
UserDetails userDetails = (UserDetails) principal;
String regId = userDetails.getUsername();
logger.debug("insertChrgReqDto= {}", insertChrgReqDto);
ChrgInfo chrgInfo = new ChrgInfo();
chrgInfo.setChrgSeq(chrgSeq);
chrgInfo.setUserSeq(userSeq);
chrgInfo.setChrgDiv(insertChrgReqDto.getChrdDiv());
chrgInfo.setStartDt(insertChrgReqDto.getStartDt());
chrgInfo.setEndDt(insertChrgReqDto.getEndDt());
String StrYm = insertChrgReqDto.getStrtYm().replace("-", "").substring(0, 6);
chrgInfo.setStrtYm(StrYm);
String EndYm = insertChrgReqDto.getEndYm().substring(0, 6);
chrgInfo.setEndYm(EndYm);
chrgInfo.setChrgAmt(insertChrgReqDto.getChrgAmt());
chrgInfo.setRegId(regId); //로그인 ID
chrgInfo.setChgId(regId); //로그인 ID
@@ -1074,8 +1103,8 @@ public class CustMgtService {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 수정
* @param UpdateChrgReqDto
* @return UpdateChrgResDto
* @param paramMap
* @return
*/
public UpdateChrgResDto UpdateChrg(@Valid UpdateChrgReqDto updateChrgReqDto) {
@@ -1086,17 +1115,21 @@ public class CustMgtService {
// 2. 새 정보 insert
String chrgSeq = custMgtMapper.getChrgSeq();
String userSeq = custMgtMapper.getUserSeq();
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
UserDetails userDetails = (UserDetails) principal;
String regId = userDetails.getUsername();
int userSeq = custMgtMapper.selectUserSeq(updateChrgReqDto.getUserId());
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
UserDetails userDetails = (UserDetails) principal;
String regId = userDetails.getUsername();
logger.debug("insertChrgReqDto= {}", updateChrgReqDto);
ChrgInfo chrgInfo = new ChrgInfo();
chrgInfo.setChrgSeq(chrgSeq);
chrgInfo.setUserSeq(userSeq);
chrgInfo.setChrgDiv(updateChrgReqDto.getChrdDiv());
chrgInfo.setStartDt(updateChrgReqDto.getStartDt());
chrgInfo.setEndDt(updateChrgReqDto.getEndDt());
String StrYm = updateChrgReqDto.getStrtYm().substring(0, 6);
chrgInfo.setStrtYm(StrYm);
String EndYm = updateChrgReqDto.getEndYm().substring(0, 6);
chrgInfo.setEndYm(EndYm);
chrgInfo.setChrgAmt(updateChrgReqDto.getChrgAmt());
chrgInfo.setRegId(regId); //로그인 ID
chrgInfo.setChgId(regId); //로그인 ID
@@ -1110,8 +1143,8 @@ public class CustMgtService {
* date : 2023. 3. 15.
* auth : won
* desc : 충전관리 삭제
* @param DeleteChrgReqDto
* @return DeleteChrgResDto
* @param paramMap
* @return
*/
public DeleteChrgResDto DeleteChrg(@Valid DeleteChrgReqDto deleteChrgReqDto) {
CustMgtMapper custMgtMapper = sqlSessionMaster.getMapper(CustMgtMapper.class);

6
src/main/java/kr/co/uplus/ez/api/custMgt/dto/ChrgInfo.java
View File

@@ -11,13 +11,13 @@ public class ChrgInfo implements Serializable{
/** 충전 SEQUENCE */
private String chrgSeq;
/** 유저 SEQUENCE */
private String userSeq;
private int userSeq;
/** 충전구분 */
private String chrgDiv;
/** 충전 시작년월 */
private String startDt;
private String strtYm;
/** 충전 종료년월 */
private String endDt;
private String endYm;
/** 충전금액 */
private String chrgAmt;
/** 사용여부 */

9
src/main/java/kr/co/uplus/ez/api/custMgt/dto/ChrgList.java
View File

@@ -15,15 +15,18 @@ public class ChrgList implements Serializable{
@ApiModelProperty(example = "고객명", name = "고객명", dataType = "String")
private String userId;
@ApiModelProperty(example = "충전구분", name = "충전구분", dataType = "String")
private String chrdDiv;
private String chrgDiv;
@ApiModelProperty(example = "충전시작일", name = "충전시작일", dataType = "String")
private String startDt;
private String strtYm;
@ApiModelProperty(example = "충전종료일", name = "충전종료일", dataType = "String")
private String endDt;
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 = "충전기간", name = "충전기간", dataType = "String")
private String chrgDate;
}

1
src/main/java/kr/co/uplus/ez/api/custMgt/dto/ChrgListRes.java
View File

@@ -10,5 +10,6 @@ import lombok.Data;
@Data
public class ChrgListRes implements Serializable{
private Paging paging;
private List<ChrgList> list;
}

4
src/main/java/kr/co/uplus/ez/api/custMgt/dto/InsertChrgReqDto.java
View File

@@ -21,9 +21,9 @@ public class InsertChrgReqDto implements Serializable{
@ApiModelProperty(example = "충전구분", name = "충전구분", dataType = "String")
private String chrdDiv;
@ApiModelProperty(example = "충전시작일", name = "충전시작일", dataType = "String")
private String startDt;
private String strtYm;
@ApiModelProperty(example = "충전종료일", name = "충전종료일", dataType = "String")
private String endDt;
private String endYm;
@ApiModelProperty(example = "충전금액", name = "충전금액", dataType = "String")
private String chrgAmt;
@ApiModelProperty(example = "사용여부", name = "사용여부", dataType = "String")

4
src/main/java/kr/co/uplus/ez/api/custMgt/dto/UpdateChrgReqDto.java
View File

@@ -16,9 +16,9 @@ public class UpdateChrgReqDto implements Serializable{
@ApiModelProperty(example = "충전구분", name = "충전구분", dataType = "String")
private String chrdDiv;
@ApiModelProperty(example = "충전시작일", name = "충전시작일", dataType = "String")
private String startDt;
private String strtYm;
@ApiModelProperty(example = "충전종료일", name = "충전종료일", dataType = "String")
private String endDt;
private String endYm;
@ApiModelProperty(example = "충전금액", name = "충전금액", dataType = "String")
private String chrgAmt;
@ApiModelProperty(example = "사용여부", name = "사용여부", dataType = "String")

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

@@ -1145,40 +1145,46 @@
</update>
<!-- 충전관리 목록 조회 -->
<select id="selectChrgList" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgListReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgListResDto">
<select id="selectChrgList" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgListReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.ChrgList">
SELECT
@ROWNUM := @ROWNUM + 1 AS NO
, eci.CUST_NM
, esu.USER_ID
, ecm.CHRG_DIV
, ecm.STRT_YM
, ecm.END_YM
, ecm.CHRG_AMT
, ecm.USE_YN
, eci.BIZRNO
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 ecm.USE_YN ='Y' AND 1 =1
<if test="startDt != null and startDt != ''">
AND esi.SUBS_DT <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m%')
</if>
<if test="endDt != null and endDt != ''">
AND esi.SUBS_DT <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m%')
</if>
<if test="searchType1 != null and searchType1 != ''">
<if test="searchType1 == '01' and searchText1 != null and searchText1 != ''">
AND UPPER(eci.CUST_NM) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
<if test="searchType1 == '02' and searchText1 != null and searchText1 != ''">
AND UPPER(eci.BIZRNO) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
<if test="searchType1 == '03' and searchText1 != null and searchText1 != ''">
AND UPPER(esu.USER_ID) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
</if>
ORDER BY esu.USER_ID DESC
@ROWNUM := @ROWNUM + 1 AS NO
,A.*
FROM (
SELECT
@ROWNUM := @ROWNUM + 1 AS NO
, eci.CUST_NM
, esu.USER_ID
, ecm.CHRG_DIV
, ecm.STRT_YM
, ecm.END_YM
, ecm.CHRG_AMT
, ecm.USE_YN
, eci.BIZRNO
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'
<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>
<if test="searchType1 != null and searchType1 != ''">
<if test="searchType1 == '01' and searchText1 != null and searchText1 != ''">
AND UPPER(eci.CUST_NM) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
<if test="searchType1 == '02' and searchText1 != null and searchText1 != ''">
AND UPPER(eci.BIZRNO) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
<if test="searchType1 == '03' and searchText1 != null and searchText1 != ''">
AND UPPER(esu.USER_ID) LIKE UPPER(CONCAT('%', #{searchText1}, '%'))
</if>
</if>
ORDER BY esu.USER_ID DESC) A ,
( SELECT @ROWNUM := #{page} ) AS R
</select>
<!-- 이용자 충전번호 조회(채번) -->
@@ -1186,8 +1192,9 @@
/* custMgt-mapper.xml(getChrgSeq) */
SELECT hubez_common.FUN_NEXT_SEQ('CHRG_SEQ')
</select>
<!-- 충전관리 등록 -->
<insert id="insertChrgInfo">
<insert id="insertChrgInfo" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
INSERT INTO hubez_admin.EZ_CHARGE_MNG (
CHRG_SEQ
, USER_SEQ
@@ -1200,14 +1207,14 @@
, REG_DT
, CHG_ID
, CHG_DT
)
) VALUES(
#{chrgSeq}
, #{userSeq}
, 'Y'
, #{startDt}
, #{endDt}
, 'E'
, #{strtYm}
, #{endYm}
, #{chrgAmt}
, 'Y'
, #{regId}
, NOW()
, #{regId}
@@ -1215,14 +1222,14 @@
)
</insert>
<update id="updateChrg">
<update id="updateChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
hubez_admin.EZ_CHARGE_MNG
set
ecm.USE_YN ='N'
WHERE USER_SEQ = (SELECT USER_SEQ FROM hubez_common.EZ_SVC_USER WHERE USER_ID = #{userId})
</update>
<insert id="addChrg">
<insert id="addChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
INSERT INTO hubez_admin.EZ_CHARGE_MNG (
CHRG_SEQ
, USER_SEQ
@@ -1250,7 +1257,7 @@
)
</insert>
<update id="deleteChrg">
<update id="deleteChrg" parameterType="kr.co.uplus.ez.api.custMgt.dto.ChrgInfo">
UPDATE
hubez_admin.EZ_CHARGE_MNG
set