Commit @d7041e2759ee9448496308e5c827de26b0eb280f

박민혁 2024-03-13

240313 박민혁 계정과목 정보 수정

@d7041e2759ee9448496308e5c827de26b0eb280f

be7a1d6

d7041e2

src/main/java/com/ajin/ajinerp/master/account/dao/AccountDAO.java

--- src/main/java/com/ajin/ajinerp/master/account/dao/AccountDAO.java

+++ src/main/java/com/ajin/ajinerp/master/account/dao/AccountDAO.java


      *
      * 계정 과목 정보 조회
      */
-    List<AccountVO> getAccountData() throws Exception;
+    List<AccountVO> getAccountList() throws Exception;
+
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 단일 조회
+     */
+    AccountVO getAccountData(AccountVO accountVO) throws Exception;
+
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 추가 및 수정
+     */
+    int mergeAccountData(AccountVO accountVO) throws Exception;
 
 }

be7a1d6

d7041e2

src/main/java/com/ajin/ajinerp/master/account/service/AccountService.java

--- src/main/java/com/ajin/ajinerp/master/account/service/AccountService.java

+++ src/main/java/com/ajin/ajinerp/master/account/service/AccountService.java


 package com.ajin.ajinerp.master.account.service;
 
 import com.ajin.ajinerp.common.vo.CustomeResultMap;
+import com.ajin.ajinerp.master.account.vo.AccountVO;
 
 public interface AccountService {
     /**

      *
      * 계정 과목 정보 조회
      */
-    CustomeResultMap getAccountData() throws Exception;
+    CustomeResultMap getAccountList() throws Exception;
+
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 단일 조회
+     */
+    CustomeResultMap getAccountData(AccountVO accountVO) throws Exception;
+
 
 }

be7a1d6

d7041e2

src/main/java/com/ajin/ajinerp/master/account/service/impl/AccountServiceImpl.java

--- src/main/java/com/ajin/ajinerp/master/account/service/impl/AccountServiceImpl.java

+++ src/main/java/com/ajin/ajinerp/master/account/service/impl/AccountServiceImpl.java


      * 계정 과목 정보 조회
      */
     @Override
-    public CustomeResultMap getAccountData() throws Exception{
-        List<AccountVO> account = accountDAO.getAccountData();
+    public CustomeResultMap getAccountList() throws Exception{
+        List<AccountVO> accountList = accountDAO.getAccountList();
         CustomeResultMap resultMap = new CustomeResultMap();
-        resultMap.getResultData().put("account",account);
+        resultMap.getResultData().put("accountList",accountList);
         return resultMap;
     }
 
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 단일 조회
+     */
+    @Override
+    public CustomeResultMap getAccountData(AccountVO accountVO) throws Exception{
+        AccountVO account = accountDAO.getAccountData(accountVO);
+        CustomeResultMap resultMap = new CustomeResultMap();
+        resultMap.getResultData().put("account", account);
+        return resultMap;
+
+    }
 }

be7a1d6

d7041e2

src/main/java/com/ajin/ajinerp/master/account/vo/AccountVO.java

--- src/main/java/com/ajin/ajinerp/master/account/vo/AccountVO.java

+++ src/main/java/com/ajin/ajinerp/master/account/vo/AccountVO.java


     private String semugu;
     // 프로젝트구분(업무구분:SM 분류코드:013)
     private String pjcode;
-
-    private String BLTXNM;
-    private String BGTXNM;
-    private String BLCDNM;
-    private String BGCDNM;
+    // 잔액 구분
+    private String dcgunm;
+    // 세무 계정
+    private String semunm;
+    // 동변계정(계산서)
+    private String bltxnm;
+    // 동변불공제계정(계산서)
+    private String bgtxnm;
+    // 동변계정(법인카드)
+    private String blcdnm;
+    // 동변불공제계정(법인카드)
+    private String bgcdnm;
 }

be7a1d6

d7041e2

src/main/java/com/ajin/ajinerp/master/account/web/AccountController.java

--- src/main/java/com/ajin/ajinerp/master/account/web/AccountController.java

+++ src/main/java/com/ajin/ajinerp/master/account/web/AccountController.java


 
 import com.ajin.ajinerp.common.vo.CustomeResultMap;
 import com.ajin.ajinerp.master.account.service.AccountService;
+import com.ajin.ajinerp.master.account.vo.AccountVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController

      *
      * 계정 과목 정보 조회
      */
-    @GetMapping(value = "/getMemberById.json")
-    public CustomeResultMap getAccountData() throws Exception{
-        CustomeResultMap map = accountService.getAccountData();
+    @GetMapping(value = "/getAccountList.json")
+    public CustomeResultMap getAccountList() throws Exception{
+        CustomeResultMap map = accountService.getAccountList();
         return map;
-
     }
+
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 단일 조회
+     */
+    @PostMapping(value = "/getAccountData.json")
+    public CustomeResultMap getAccountData(@RequestBody AccountVO accountVO) throws Exception{
+        CustomeResultMap map = accountService.getAccountData(accountVO);
+        return map;
+    }
+
 }

be7a1d6

d7041e2

src/main/resources/spring/mapper/account/account-SQL.xml

--- src/main/resources/spring/mapper/account/account-SQL.xml

+++ src/main/resources/spring/mapper/account/account-SQL.xml

...	...	@@ -3,7 +3,75 @@
3	3
4	4
5	5	<mapper namespace="com.ajin.ajinerp.master.account.dao.AccountDAO">
6		- <select id="">
	6	+ <!-- 계정 과목 정보 매퍼 -->
	7	+ <resultMap id="ac01001TResult" type="AccountVO">
	8	+ <result property="accode" column="ACCODE"/>
	9	+ <result property="acname" column="ACNAME"/>
	10	+ <result property="dcgubn" column="DCGUBN"/>
	11	+ <result property="blgubn" column="BLGUBN"/>
	12	+ <result property="custgu" column="CUSTGU"/>
	13	+ <result property="gyjngu" column="GYJNGU"/>
	14	+ <result property="junggu" column="JUNGGU"/>
	15	+ <result property="jdatgu" column="JDATGU"/>
	16	+ <result property="sybugu" column="SYBUGU"/>
	17	+ <result property="gomtgu" column="GOMTGU"/>
	18	+ <result property="idregx" column="IDREGX"/>
	19	+ <result property="dtmreg" column="DTMREG"/>
	20	+ <result property="tmlreg" column="TMLREG"/>
	21	+ <result property="iduptx" column="IDUPTX"/>
	22	+ <result property="dtmupt" column="DTMUPT"/>
	23	+ <result property="tmlupt" column="TMLUPT"/>
	24	+ <result property="bltaxx" column="BLTAXX"/>
	25	+ <result property="blcard" column="BLCARD"/>
	26	+ <result property="blgygu" column="BLGYGU"/>
	27	+ <result property="bgcard" column="BGCARD"/>
	28	+ <result property="bggygu" column="BGGYGU"/>
	29	+ <result property="drmtgu" column="DRMTGU"/>
	30	+ <result property="crmtgu" column="CRMTGU"/>
	31	+ <result property="exchgu" column="EXCHGU"/>
	32	+ <result property="papegu" column="PAPEGU"/>
	33	+ <result property="jiblgu" column="JIBLGU"/>
	34	+ <result property="wonjgu" column="WONJGU"/>
	35	+ <result property="semugu" column="SEMUGU"/>
	36	+ <result property="pjcode" column="PJCODE"/>
	37	+ <result property="dcgunm" column="DCGUNM" />
	38	+ <result property="semunm" column="SEMUNM" />
	39	+ <result property="bltxnm" column="BLTXNM" />
	40	+ <result property="bgtxnm" column="BGTXNM" />
	41	+ <result property="blcdnm" column="BLCDNM" />
	42	+ <result property="bgcdnm" column="BGCDNM" />
	43	+ </resultMap>
7	44
	45	+ <!-- 계정 과목 정보 조회 -->
	46	+ <select id="getAccountList" resultMap="ac01001TResult">
	47	+ SELECT A.*,
	48	+ NVL(B.ACNAME, '') AS BLTXNM,
	49	+ NVL(C.ACNAME, '') AS BGTXNM,
	50	+ NVL(D.ACNAME, '') AS BLCDNM,
	51	+ NVL(E.ACNAME, '') AS BGCDNM
	52	+ FROM (
	53	+ SELECT A.*,
	54	+ CASE WHEN A.DCGUBN = '1' THEN '1. 차변'
	55	+ WHEN A.DCGUBN = '2' THEN '2. 대변' ELSE A.DCGUBN END AS DCGUNM,
	56	+ CASE WHEN A.SEMUGU = '1' THEN '매출'
	57	+ WHEN A.SEMUGU = '2' THEN '매입' ELSE A.SEMUGU END AS SEMUNM
	58	+ FROM AC01001T A
	59	+ ) A
	60	+ LEFT OUTER JOIN (SELECT ACCODE, ACNAME FROM AC01001T) B ON B.ACCODE = A.BLTAXX
	61	+ LEFT OUTER JOIN (SELECT ACCODE, ACNAME FROM AC01001T) C ON C.ACCODE = A.BGTAXX
	62	+ LEFT OUTER JOIN (SELECT ACCODE, ACNAME FROM AC01001T) D ON D.ACCODE = A.BLCARD
	63	+ LEFT OUTER JOIN (SELECT ACCODE, ACNAME FROM AC01001T) E ON E.ACCODE = A.BGCARD
	64	+ ORDER BY A.ACCODE
8	65	</select>
	66	+
	67	+ <!-- 계정 과목 단일 정보 확인 -->
	68	+ <select id="getAccountData" parameterType="String" resultType="AccountVO">
	69	+ SELECT A.*
	70	+ FROM AC01001T A
	71	+ WHERE A.ACCODE = #{ACCODE}
	72	+ </select>
	73	+
	74	+ <!-- 계정 과목 정보 추가 및 수정 -->
	75	+
	76	+
9	77	</mapper> (No newline at end of file)

Add a comment

Open 0
Closed 0

List

...	...	@@ -14,6 +14,22 @@
14	14	*
15	15	* 계정 과목 정보 조회
16	16	*/
17		- List<AccountVO> getAccountData() throws Exception;
	17	+ List<AccountVO> getAccountList() throws Exception;
	18	+
	19	+ /**
	20	+ * @author 박민혁
	21	+ * @since 2024.03.13
	22	+ *
	23	+ * 계정 과목 정보 단일 조회
	24	+ */
	25	+ AccountVO getAccountData(AccountVO accountVO) throws Exception;
	26	+
	27	+ /**
	28	+ * @author 박민혁
	29	+ * @since 2024.03.13
	30	+ *
	31	+ * 계정 과목 정보 추가 및 수정
	32	+ */
	33	+ int mergeAccountData(AccountVO accountVO) throws Exception;
18	34
19	35	}

...	...	@@ -1,6 +1,7 @@
1	1	package com.ajin.ajinerp.master.account.service;
2	2
3	3	import com.ajin.ajinerp.common.vo.CustomeResultMap;
	4	+import com.ajin.ajinerp.master.account.vo.AccountVO;
4	5
5	6	public interface AccountService {
6	7	/**
...	...	@@ -9,6 +10,15 @@
9	10	*
10	11	* 계정 과목 정보 조회
11	12	*/
12		- CustomeResultMap getAccountData() throws Exception;
	13	+ CustomeResultMap getAccountList() throws Exception;
	14	+
	15	+ /**
	16	+ * @author 박민혁
	17	+ * @since 2024.03.13
	18	+ *
	19	+ * 계정 과목 정보 단일 조회
	20	+ */
	21	+ CustomeResultMap getAccountData(AccountVO accountVO) throws Exception;
	22	+
13	23
14	24	}

...	...	@@ -29,11 +29,25 @@
29	29	* 계정 과목 정보 조회
30	30	*/
31	31	@Override
32		- public CustomeResultMap getAccountData() throws Exception{
33		- List<AccountVO> account = accountDAO.getAccountData();
	32	+ public CustomeResultMap getAccountList() throws Exception{
	33	+ List<AccountVO> accountList = accountDAO.getAccountList();
34	34	CustomeResultMap resultMap = new CustomeResultMap();
35		- resultMap.getResultData().put("account",account);
	35	+ resultMap.getResultData().put("accountList",accountList);
36	36	return resultMap;
37	37	}
38	38
	39	+ /**
	40	+ * @author 박민혁
	41	+ * @since 2024.03.13
	42	+ *
	43	+ * 계정 과목 정보 단일 조회
	44	+ */
	45	+ @Override
	46	+ public CustomeResultMap getAccountData(AccountVO accountVO) throws Exception{
	47	+ AccountVO account = accountDAO.getAccountData(accountVO);
	48	+ CustomeResultMap resultMap = new CustomeResultMap();
	49	+ resultMap.getResultData().put("account", account);
	50	+ return resultMap;
	51	+
	52	+ }
39	53	}

...	...	@@ -70,9 +70,16 @@
70	70	private String semugu;
71	71	// 프로젝트구분(업무구분:SM 분류코드:013)
72	72	private String pjcode;
73		-
74		- private String BLTXNM;
75		- private String BGTXNM;
76		- private String BLCDNM;
77		- private String BGCDNM;
	73	+ // 잔액 구분
	74	+ private String dcgunm;
	75	+ // 세무 계정
	76	+ private String semunm;
	77	+ // 동변계정(계산서)
	78	+ private String bltxnm;
	79	+ // 동변불공제계정(계산서)
	80	+ private String bgtxnm;
	81	+ // 동변계정(법인카드)
	82	+ private String blcdnm;
	83	+ // 동변불공제계정(법인카드)
	84	+ private String bgcdnm;
78	85	}

...	...	@@ -2,8 +2,11 @@
2	2
3	3	import com.ajin.ajinerp.common.vo.CustomeResultMap;
4	4	import com.ajin.ajinerp.master.account.service.AccountService;
	5	+import com.ajin.ajinerp.master.account.vo.AccountVO;
5	6	import lombok.RequiredArgsConstructor;
6	7	import org.springframework.web.bind.annotation.GetMapping;
	8	+import org.springframework.web.bind.annotation.PostMapping;
	9	+import org.springframework.web.bind.annotation.RequestBody;
7	10	import org.springframework.web.bind.annotation.RestController;
8	11
9	12	@RestController
...	...	@@ -17,10 +20,22 @@
17	20	*
18	21	* 계정 과목 정보 조회
19	22	*/
20		- @GetMapping(value = "/getMemberById.json")
21		- public CustomeResultMap getAccountData() throws Exception{
22		- CustomeResultMap map = accountService.getAccountData();
	23	+ @GetMapping(value = "/getAccountList.json")
	24	+ public CustomeResultMap getAccountList() throws Exception{
	25	+ CustomeResultMap map = accountService.getAccountList();
23	26	return map;
24		-
25	27	}
	28	+
	29	+ /**
	30	+ * @author 박민혁
	31	+ * @since 2024.03.13
	32	+ *
	33	+ * 계정 과목 정보 단일 조회
	34	+ */
	35	+ @PostMapping(value = "/getAccountData.json")
	36	+ public CustomeResultMap getAccountData(@RequestBody AccountVO accountVO) throws Exception{
	37	+ CustomeResultMap map = accountService.getAccountData(accountVO);
	38	+ return map;
	39	+ }
	40	+
26	41	}

Delete comment