Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/java/com/oqpo/api/mapper/loanmng/DsptMngMapper.java

@@ -0,0 +1,30 @@
+package com.oqpo.api.mapper.loanmng;
+
+
+import com.oqpo.api.entity.loanmng.LoanMgntDsptProcEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DsptMngMapper {
+
+    List<LoanMgntDsptProcEntity> selectDsptMngGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sDpstStCd") String sDpstStCd,
+                                                       @Param("fromDt") String fromDt, @Param("toDt") String toDt, GridRequest gridRequest) throws Exception;
+
+    int selectDsptMngGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sDpstStCd") String sDpstStCd,
+                             @Param("fromDt") String fromDt, @Param("toDt") String toDt) throws Exception;
+
+    LoanMgntDsptProcEntity selectLoanMgntDsptProcInfo(@Param("dsptMgntNo") String dsptMgntNo) throws Exception;
+
+    int insertLoanMgntDsptProcInfo(@Param("userId") String userId, LoanMgntDsptProcEntity entity) throws Exception;
+
+    int updateLoanMgntDsptProcInfo4Approve(@Param("userId") String userId, LoanMgntDsptProcEntity entity) throws Exception;
+
+    int updateLoanMgntDsptProcInfo4Reject(@Param("userId") String userId, LoanMgntDsptProcEntity entity) throws Exception;
+
+    int deleteLoanMgntDsptProcInfo(@Param("userId") String userId, LoanMgntDsptProcEntity entity) throws Exception;
+
+}

src/main/java/com/oqpo/api/service/loanmng/DsptMngService.java

@@ -0,0 +1,165 @@
+package com.oqpo.api.service.loanmng;
+
+
+import com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity;
+import com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity;
+import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.stockmng.WhsMngMapper;
+import com.oqpo.api.service.CommonService;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.stockmng.SaveWhsInfoRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.stockmng.WhsMngInfoResponse;
+import com.oqpo.api.web.dto.response.stockmng.WhsMngListResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class DsptMngService extends CommonService {
+
+    @Autowired
+    private WhsMngMapper whsMngMapper;
+
+    /*
+      입금관리 그리드 리스트 조회
+     */
+    public GridResponse selectWhsMngGridList(String sBrandId, String sStoreId, String sWhsDvsn, String sWhsStCd,
+                                             String sWhsNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = whsMngMapper.selectWhsMngGridCnt(sBrandId, sStoreId, sWhsDvsn, sWhsStCd, sWhsNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<WhsMgntBaseInfoEntity> entities = whsMngMapper.selectWhsMngGridList(sBrandId, sStoreId, sWhsDvsn, sWhsStCd, sWhsNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> WhsMngListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .whsId(m.getWhsId())
+                        .whsNm(m.getWhsNm())
+                        .whsDvsn(m.getWhsDvsn())
+                        .whsDvsnNm(m.getWhsDvsnNm())
+                        .mgrNm(m.getMgrNm())
+                        .mgrTelNo(m.getMgrTelNo())
+                        .whsStCd(m.getWhsStCd())
+                        .whsStNm(m.getWhsStNm())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /* 입금관리 정보 조회 */
+    public WhsMngInfoResponse selectWhsMngInfo(String brandId, String whsId) throws Exception {
+        WhsMgntBaseInfoEntity entity = whsMngMapper.selectWhsMgntBaseInfo(brandId, whsId);
+        List<WhsMgntBaseLocEntity> locEntityList = whsMngMapper.selectWhsLocGridList(brandId, whsId);
+        return WhsMngInfoResponse.toDTO(entity, locEntityList);
+    }
+
+    /* 입금요청 */
+    @Transactional
+    public void addWhsInfo(String userId, SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        try {
+            // 입금관리기본정보
+            WhsMgntBaseInfoEntity entity = new WhsMgntBaseInfoEntity();
+            entity.setBrandId(saveWhsInfoRequest.getBrandId());
+            entity.setWhsId(fnGetDealNo(28, "")); // 창고아이디 채번
+            entity.setWhsNm(saveWhsInfoRequest.getWhsNm());
+            entity.setWhsDvsn(saveWhsInfoRequest.getWhsDvsn());
+            entity.setMgrNm(saveWhsInfoRequest.getMgrNm());
+            entity.setMgrTelNo(saveWhsInfoRequest.getMgrTelNo());
+            entity.setZipNo(saveWhsInfoRequest.getZipNo());
+            entity.setAddr1(saveWhsInfoRequest.getAddr1());
+            entity.setAddr2(saveWhsInfoRequest.getAddr2());
+            entity.setWhsStCd(saveWhsInfoRequest.getWhsStCd());
+            entity.setStoreId(saveWhsInfoRequest.getStoreId());
+            whsMngMapper.insertWhsMgntBaseInfo(userId, entity);
+
+            // 창고로케이션정보
+            List<WhsMgntBaseLocEntity> locEntities = saveWhsInfoRequest.toEntities(saveWhsInfoRequest.getGridInsertData());
+            for (WhsMgntBaseLocEntity locEntity : locEntities) {
+                whsMngMapper.insertWhsMgntBaseLoc(userId, locEntity);
+            }
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+    /* 창고정보 수정 */
+    @Transactional
+    public void modifyWhsInfo(String userId, SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        try {
+            // 입금관리기본정보
+            WhsMgntBaseInfoEntity entity = new WhsMgntBaseInfoEntity();
+            entity.setBrandId(saveWhsInfoRequest.getBrandId());
+            entity.setWhsId(saveWhsInfoRequest.getWhsId());
+            entity.setWhsNm(saveWhsInfoRequest.getWhsNm());
+            entity.setWhsDvsn(saveWhsInfoRequest.getWhsDvsn());
+            entity.setMgrNm(saveWhsInfoRequest.getMgrNm());
+            entity.setMgrTelNo(saveWhsInfoRequest.getMgrTelNo());
+            entity.setZipNo(saveWhsInfoRequest.getZipNo());
+            entity.setAddr1(saveWhsInfoRequest.getAddr1());
+            entity.setAddr2(saveWhsInfoRequest.getAddr2());
+            entity.setWhsStCd(saveWhsInfoRequest.getWhsStCd());
+            entity.setStoreId(saveWhsInfoRequest.getStoreId());
+            whsMngMapper.updateWhsMgntBaseInfo(userId, entity);
+
+            // 창고로케이션정보
+            // 삭제
+            List<WhsMgntBaseLocEntity> locEntities = saveWhsInfoRequest.toEntities(saveWhsInfoRequest.getGridDeleteData());
+            for (WhsMgntBaseLocEntity locEntity : locEntities) {
+                whsMngMapper.deleteWhsMgntBaseLoc(userId, locEntity);
+            }
+            // 수정
+            locEntities = saveWhsInfoRequest.toEntities(saveWhsInfoRequest.getGridUpdateData());
+            for (WhsMgntBaseLocEntity locEntity : locEntities) {
+                whsMngMapper.updateWhsMgntBaseLoc(userId, locEntity);
+            }
+            // 등록
+            locEntities = saveWhsInfoRequest.toEntities(saveWhsInfoRequest.getGridInsertData());
+            for (WhsMgntBaseLocEntity locEntity : locEntities) {
+                whsMngMapper.insertWhsMgntBaseLoc(userId, locEntity);
+            }
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+    /* 창고정보 삭제 */
+    @Transactional
+    public void removeWhsInfo(String userId, SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        try {
+            // 입금관리기본정보
+            WhsMgntBaseInfoEntity entity = new WhsMgntBaseInfoEntity();
+            entity.setBrandId(saveWhsInfoRequest.getBrandId());
+            entity.setWhsId(saveWhsInfoRequest.getWhsId());
+            whsMngMapper.deleteWhsMgntBaseInfo(userId, entity);
+
+            // 창고로케이션정보
+            whsMngMapper.deleteWhsMgntBaseLoc4Info(userId, entity);
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+}

src/main/java/com/oqpo/api/web/controller/loanmng/DsptMngController.java

@@ -0,0 +1,138 @@
+package com.oqpo.api.web.controller.loanmng;
+
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.service.stockmng.WhsMngService;
+import com.oqpo.api.web.dto.request.stockmng.BrandWhsMngGridRequest;
+import com.oqpo.api.web.dto.request.stockmng.SaveWhsInfoRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
+import com.oqpo.api.web.dto.response.stockmng.WhsMngInfoResponse;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/dspt/mng")
+public class DsptMngController {
+
+    @Autowired
+    private WhsMngService whsMngService;
+
+    /**
+     * 설명 : 입금관리 그리드 리스트
+     *
+     * @param brandWhsMngGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입금관리 그리드 리스트")
+    @PostMapping("/detail-grid-list")
+    public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid BrandWhsMngGridRequest brandWhsMngGridRequest) throws Exception {
+        return ResponseEntity.ok(whsMngService.selectWhsMngGridList(brandWhsMngGridRequest.getSBrandId(), brandWhsMngGridRequest.getSStoreId(),
+                brandWhsMngGridRequest.getSWhsDvsn(), brandWhsMngGridRequest.getSWhsStCd(),
+                brandWhsMngGridRequest.getSWhsNm(), brandWhsMngGridRequest.toDTO(brandWhsMngGridRequest)));
+    }
+
+    /**
+     * 설명 : 입금 요청
+     *
+     * @param userId
+     * @param saveWhsInfoRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입금 요청")
+    @PostMapping("/request-dspt")
+    public ResponseEntity<SaveResponse> requestDspt(@ApiIgnore String userId, @RequestBody @Valid SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        whsMngService.addWhsInfo(userId, saveWhsInfoRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+    /**
+     * 설명 : 입금 승인
+     *
+     * @param userId
+     * @param saveWhsInfoRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입금 승인")
+    @PostMapping("/approve-dspt")
+    public ResponseEntity<SaveResponse> approveDspt(@ApiIgnore String userId, @RequestBody @Valid SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        whsMngService.removeWhsInfo(userId, saveWhsInfoRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+    /**
+     * 설명 : 입금 반려
+     *
+     * @param userId
+     * @param saveWhsInfoRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입금 반려")
+    @PostMapping("/reject-dspt")
+    public ResponseEntity<SaveResponse> rejectDspt(@ApiIgnore String userId, @RequestBody @Valid SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        whsMngService.removeWhsInfo(userId, saveWhsInfoRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+    /**
+     * 설명 : 입금 정보
+     *
+     * @param brandId
+     * @param whsId
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "whsId", value = "입금아이디", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "입금 정보")
+    @GetMapping("/info-dspt")
+    public ResponseEntity<WhsMngInfoResponse> infoDspt(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "whsId") String whsId) throws Exception {
+        return ResponseEntity.ok(whsMngService.selectWhsMngInfo(brandId, whsId));
+    }
+
+    /**
+     * 설명 : 입금 정보 삭제
+     *
+     * @param userId
+     * @param saveWhsInfoRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입금 삭제")
+    @PostMapping("/remove-dspt")
+    public ResponseEntity<SaveResponse> removeDspt(@ApiIgnore String userId, @RequestBody @Valid SaveWhsInfoRequest saveWhsInfoRequest) throws Exception {
+        whsMngService.modifyWhsInfo(userId, saveWhsInfoRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+}

src/main/resources/mybatis/sqlmaps/loanmng/DsptMng.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.loanmng.DsptMngMapper">
+
+    <select id="selectDsptMngGridList" resultType="com.oqpo.api.entity.loanmng.LoanMgntDsptProcEntity">
+        /* DsptMngMapper.selectDsptMngGridList */
+        SELECT A.dspt_mgnt_no,
+            A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
+            A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
+            A.dpst_amt, DATE_FORMAT(A.dpst_dt, '%Y.%m.%d') AS dpst_dt, A.dpst_nm,
+            A.dpst_st_cd, FN_CODE_NM('DPST_ST_CD', A.dpst_st_cd) AS dpst_st_nm,
+            A.dpst_bnk_cd, FN_CODE_NM('DPST_BNK_CD', A.dpst_bnk_cd) AS dpst_bnk_nm,
+            A.rcv_acct_no,
+            DATE_FORMAT(A.req_dt, '%Y.%m.%d') AS req_dt,
+            DATE_FORMAT(A.dpst_auth_dt, '%Y.%m.%d') AS dpst_auth_dt,
+            DATE_FORMAT(A.dspt_rjct_dt, '%Y.%m.%d') AS dspt_rjct_dt,
+            A.dspt_rjct_rsn
+        FROM loan_mgnt_dspt_proc A
+        WHERE A.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            AND A.store_id = #{sStoreId}
+        </if>
+        <if test="sDpstStCd != null and sDpstStCd != ''">
+            AND A.dpst_st_cd = #{sDpstStCd}
+        </if>
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+            AND A.dpst_dt BETWEEN #{fromDt} AND #{toDt}
+        </if>
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.dspt_mgnt_no ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.dspt_mgnt_no DESC
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                ORDER BY A.dspt_mgnt_no ASC
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectDsptMngGridCnt" resultType="int">
+        /* DsptMngMapper.selectDsptMngGridCnt */
+        SELECT COUNT(*)
+        FROM loan_mgnt_dspt_proc A
+        WHERE A.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            AND A.store_id = #{sStoreId}
+        </if>
+        <if test="sDpstStCd != null and sDpstStCd != ''">
+            AND A.dpst_st_cd = #{sDpstStCd}
+        </if>
+        <if test="fromDt != null and fromDt != '' and toDt != null and toDt != '' ">
+            AND A.dpst_dt BETWEEN #{fromDt} AND #{toDt}
+        </if>
+    </select>
+
+    <select id="selectLoanMgntDsptProcInfo" resultType="com.oqpo.api.entity.loanmng.LoanMgntDsptProcEntity">
+        /* DsptMngMapper.selectLoanMgntDsptProcInfo */
+        SELECT A.dspt_mgnt_no,
+            DATE_FORMAT(A.req_dt, '%Y.%m.%d') AS req_dt, TIME_FORMAT(A.req_tm, '%H:%i:%s') AS req_tm,
+            A.dpst_amt, DATE_FORMAT(A.dpst_dt, '%Y.%m.%d') AS dpst_dt, A.dpst_nm, A.rcv_acct_no,
+            A.dpst_bnk_cd, FN_CODE_NM('DPST_BNK_CD', A.dpst_bnk_cd) AS dpst_bnk_nm,
+            A.dpst_st_cd, FN_CODE_NM('DPST_ST_CD', A.dpst_st_cd) AS dpst_st_nm,
+            A.dpst_req_id, A.dpst_req_nm, A.dpst_auth_id, A.dpst_auth_nm,
+            DATE_FORMAT(A.dpst_auth_dt, '%Y.%m.%d') AS dpst_auth_dt, TIME_FORMAT(A.dpst_auth_tm, '%H:%i:%s') AS dpst_auth_tm,
+            DATE_FORMAT(A.dspt_rjct_dt, '%Y.%m.%d') AS dspt_rjct_dt, TIME_FORMAT(A.dspt_rjct_tm, '%H:%i:%s') AS dspt_rjct_tm,
+            A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
+            A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
+            A.dpst_auth_yn, A.dspt_rjct_rsn,
+            DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
+        FROM loan_mgnt_dspt_proc A
+        WHERE A.dspt_mgnt_no = #{dsptMgntNo}
+    </select>
+
+    <insert id="insertLoanMgntDsptProcInfo" >
+        /* DsptMngMapper.insertLoanMgntDsptProcInfo */
+        INSERT INTO loan_mgnt_dspt_proc
+            (dspt_mgnt_no, req_dt, req_tm, dpst_amt, dpst_dt, dpst_nm, rcv_acct_no, dpst_bnk_cd, dpst_st_cd, dpst_req_id,
+             dpst_req_nm, dpst_auth_id, dpst_auth_nm, dpst_auth_dt, dpst_auth_tm, dspt_rjct_dt, dspt_rjct_tm,
+             store_id, brand_id, dpst_auth_yn, dspt_rjct_rsn, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        VALUES
+            (#{entity.dsptMgntNo}, #{entity.reqDt}, #{entity.reqTm}, #{entity.dpstAmt}, #{entity.dpstDt}, #{entity.dpstNm},
+             #{entity.rcvAcctNo}, #{entity.dpstBnkCd}, #{entity.dpstStCd}, #{entity.dpstReqId}, #{entity.dpstReqNm},
+             #{entity.dpstAuthId}, #{entity.dpstAuthNm}, #{entity.dpstAuthDt}, #{entity.dpstAuthTm}, #{entity.dsptRjctDt},
+             #{entity.dsptRjctTm}, #{entity.storeId}, #{entity.brandId}, #{entity.dpstAuthYn}, #{entity.dsptRjctRsn},
+             NOW(), #{userId}, NOW(), #{userId})
+    </insert>
+
+    <update id="updateLoanMgntDsptProcInfo4Approve" >
+        /* DsptMngMapper.updateLoanMgntDsptProcInfo4Approve */
+        UPDATE loan_mgnt_dspt_proc SET
+            dpst_st_cd = #{entity.dpstStCd},        /* 입금상태코드 */
+            dpst_auth_id = #{entity.dpstAuthId},    /* 입금승인자아이디 */
+            dpst_auth_nm = #{entity.dpstAuthNm},    /* 입금승인자명 */
+            dpst_auth_dt = #{entity.dpstAuthDt},    /* 입금승인일자 */
+            dpst_auth_tm = #{entity.dpstAuthTm},    /* 입금승인시각 */
+            dpst_auth_yn = #{entity.dpstAuthYn},    /* 입금승인여부 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE dspt_mgnt_no = #{entity.dsptMgntNo}
+    </update>
+
+    <update id="updateLoanMgntDsptProcInfo4Reject" >
+        /* DsptMngMapper.updateLoanMgntDsptProcInfo4Reject */
+        UPDATE loan_mgnt_dspt_proc SET
+            dpst_st_cd = #{entity.dpstStCd},        /* 입금상태코드 */
+            dspt_rjct_dt = #{entity.dsptRjctDt},    /* 입금반려일자 */
+            dspt_rjct_tm = #{entity.dsptRjctTm},    /* 입금반려시각 */
+            dpst_auth_yn = #{entity.dpstAuthYn},    /* 입금승인여부 */
+            dspt_rjct_rsn = #{entity.dsptRjctRsn},  /* 입금반려사유 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{entity.sysChgId}
+        WHERE dspt_mgnt_no = #{entity.dsptMgntNo}
+    </update>
+
+    <delete id="deleteLoanMgntDsptProcInfo" >
+        /* DsptMngMapper.deleteLoanMgntDsptProcInfo */
+        DELETE FROM loan_mgnt_dspt_proc
+        WHERE dspt_mgnt_no = #{entity.dsptMgntNo}
+    </delete>
+
+</mapper>

src/main/resources/mybatis/sqlmaps/loanmng/LoanState.xml

@@ -80,11 +80,11 @@
 
     <select id="selectLoanHistGridList" resultType="com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity">
         /* LoanStateMapper.selectLoanHistGridList */
-        SELECT A.loan_mgnt_unq_no, A.loan_reg_dt, A.loan_reg_tm,
+        SELECT A.loan_mgnt_unq_no,
+            DATE_FORMAT(A.loan_reg_dt, '%Y.%m.%d') AS loan_reg_dt, TIME_FORMAT(A.loan_reg_tm, '%H:%i:%s') AS loan_reg_tm,
             A.dpst_pay_dvsn, FN_CODE_NM('DPST_PAY_DVSN', A.dpst_pay_dvsn) AS dpst_pay_dvsn_nm, A.trsc_amt, A.trsc_bf_bal,
             A.trsc_af_bal, A.media_dvsn, FN_CODE_NM('MEDIA_DVSN', A.media_dvsn) AS media_dvsn_nm,
-            A.rcv_acct_no, A.paym_acct_no, A.dpst_dt, A.dpst_nm, A.dpst_bnk_cd, A.dspt_mgnt_no, A.loan_desc,
-            DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
+            A.rcv_acct_no, A.paym_acct_no, A.dpst_dt, A.dpst_nm, A.dpst_bnk_cd, A.dspt_mgnt_no, A.loan_desc
         FROM loan_mgnt_dtl_hst A
         WHERE A.loan_mgnt_unq_no = #{sLoanMgntUnqNo}
         <if test="sDpstPayDvsn != null and sDpstPayDvsn != ''">

src/main/resources/mybatis/sqlmaps/stockmng/WhsMng.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.oqpo.api.mapper.stockmng.WhsMngMapper">
 
     <select id="selectWhsMngGridList" resultType="com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity">
-        /* StockMngMapper.selectWhsMngGridList */
+        /* WhsMngMapper.selectWhsMngGridList */
         SELECT A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
             A.whs_id, A.whs_nm, A.whs_dvsn, FN_CODE_NM('WHS_DVSN', A.whs_dvsn) AS whs_dvsn_nm,
             A.mgr_nm, A.mgr_tel_no, A.whs_st_cd, FN_CODE_NM('WHS_ST_CD', A.whs_st_cd) AS whs_st_nm,
@@ -44,7 +44,7 @@
     </select>
 
     <select id="selectWhsMngGridCnt" resultType="int">
-        /* StockMngMapper.selectWhsMngGridCnt */
+        /* WhsMngMapper.selectWhsMngGridCnt */
         SELECT COUNT(*)
         FROM whs_mgnt_base_info A
         WHERE A.brand_id = #{sBrandId}
@@ -63,7 +63,7 @@
     </select>
 
     <select id="selectWhsMgntBaseInfo" resultType="com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity">
-        /* StockMngMapper.selectWhsMgntBaseInfo */
+        /* WhsMngMapper.selectWhsMgntBaseInfo */
         SELECT A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
             A.whs_id, A.whs_nm, A.whs_dvsn, FN_CODE_NM('WHS_DVSN', A.whs_dvsn) AS whs_dvsn_nm,
             A.mgr_nm, A.mgr_tel_no, A.zip_no,
@@ -76,7 +76,7 @@
     </select>
 
     <select id="selectWhsLocGridList" resultType="com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity">
-        /* StockMngMapper.selectWhsLocGridList */
+        /* WhsMngMapper.selectWhsLocGridList */
         SELECT A.brand_id, A.whs_id, A.location, A.location_nm,
             A.stck_dvsn, FN_CODE_NM('STCK_DVSN', A.stck_dvsn) AS stck_dvsn_nm,
             A.loc_st_cd, FN_CODE_NM('LOC_ST_CD', A.loc_st_cd) AS loc_st_nm
@@ -87,7 +87,7 @@
     </select>
 
     <insert id="insertWhsMgntBaseInfo" >
-        /* StockMngMapper.insertWhsMgntBaseInfo */
+        /* WhsMngMapper.insertWhsMgntBaseInfo */
         INSERT INTO whs_mgnt_base_info
             (brand_id, whs_id, whs_nm, whs_dvsn, mgr_nm, mgr_tel_no, zip_no, addr1, addr2, whs_st_cd, store_id,
              sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
@@ -98,7 +98,7 @@
     </insert>
 
     <update id="updateWhsMgntBaseInfo" >
-        /* StockMngMapper.updateWhsMgntBaseInfo */
+        /* WhsMngMapper.updateWhsMgntBaseInfo */
         UPDATE whs_mgnt_base_info SET
             whs_nm = #{entity.whsNm},
             whs_dvsn = #{entity.whsDvsn},
@@ -116,21 +116,21 @@
     </update>
 
     <delete id="deleteWhsMgntBaseInfo" >
-        /* StockMngMapper.deleteWhsMgntBaseInfo */
+        /* WhsMngMapper.deleteWhsMgntBaseInfo */
         DELETE FROM whs_mgnt_base_info
         WHERE brand_id = #{entity.brandId}
         AND whs_id = #{entity.whsId}
     </delete>
 
     <delete id="deleteWhsMgntBaseLoc4Info" >
-        /* StockMngMapper.deleteWhsMgntBaseLoc4Info */
+        /* WhsMngMapper.deleteWhsMgntBaseLoc4Info */
         DELETE FROM whs_mgnt_base_loc
         WHERE brand_id = #{entity.brandId}
         AND whs_id = #{entity.whsId}
     </delete>
 
     <insert id="insertWhsMgntBaseLoc" >
-        /* StockMngMapper.insertWhsMgntBaseLoc */
+        /* WhsMngMapper.insertWhsMgntBaseLoc */
         INSERT INTO whs_mgnt_base_loc
             (brand_id, whs_id, location, location_nm, stck_dvsn, loc_st_cd,
              sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
@@ -140,7 +140,7 @@
     </insert>
 
     <update id="updateWhsMgntBaseLoc" >
-        /* StockMngMapper.updateWhsMgntBaseLoc */
+        /* WhsMngMapper.updateWhsMgntBaseLoc */
         UPDATE whs_mgnt_base_loc SET
             location_nm = #{entity.locationNm},
             stck_dvsn = #{entity.stckDvsn},
@@ -153,7 +153,7 @@
     </update>
 
     <delete id="deleteWhsMgntBaseLoc" >
-        /* StockMngMapper.deleteWhsMgntBaseLoc */
+        /* WhsMngMapper.deleteWhsMgntBaseLoc */
         DELETE FROM whs_mgnt_base_loc
         WHERE brand_id = #{entity.brandId}
         AND whs_id = #{entity.whsId}