Commit @2344a1d1f768be9b829c5352d3cc78a4f5e98e7c

박민혁 2024-03-14

240314 박민혁 계정과목 정보

@2344a1d1f768be9b829c5352d3cc78a4f5e98e7c

9a0ff3a

2344a1d

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


 
     /**
      * @author 박민혁
+     * @since 2024.03.14
+     *
+     * 계정 과목 정보 검색
+     */
+    List<AccountVO> searchAccountList(AccountVO accountVO) throws Exception;
+
+    /**
+     * @author 박민혁
      * @since 2024.03.13
      *
      * 계정 과목 정보 단일 조회

      */
     int mergeAccountData(AccountVO accountVO) throws Exception;
 
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 삭제
+     */
+    int deleteAccountData(String accode) throws Exception;
+
+
 }

9a0ff3a

2344a1d

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


 import com.ajin.ajinerp.common.vo.CustomeResultMap;
 import com.ajin.ajinerp.master.account.vo.AccountVO;
 
+import java.util.List;
+
 public interface AccountService {
     /**
      * @author 박민혁

 
     /**
      * @author 박민혁
+     * @since 2024.03.14
+     *
+     * 계정 과목 정보 검색
+     */
+    CustomeResultMap searchAccountList(AccountVO accountVO) throws Exception;
+
+    /**
+     * @author 박민혁
      * @since 2024.03.13
      *
      * 계정 과목 정보 단일 조회
      */
     CustomeResultMap getAccountData(AccountVO accountVO) throws Exception;
 
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 추가 및 수정
+     */
+    CustomeResultMap mergeAccountData(AccountVO accountVO) throws Exception;
+
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 삭제
+     */
+    CustomeResultMap deleteAccountData(String accode) throws Exception;
 
 }

9a0ff3a

2344a1d

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

...	...	@@ -38,6 +38,20 @@
38	38
39	39	/**
40	40	* @author 박민혁
	41	+ * @since 2024.03.14
	42	+ *
	43	+ * 계정 과목 정보 검색
	44	+ */
	45	+ @Override
	46	+ public CustomeResultMap searchAccountList(AccountVO accountVO) throws Exception{
	47	+ List<AccountVO> accountList = accountDAO.searchAccountList(accountVO);
	48	+ CustomeResultMap resultMap = new CustomeResultMap();
	49	+ resultMap.getResultData().put("accountList",accountList);
	50	+ return resultMap;
	51	+ }
	52	+
	53	+ /**
	54	+ * @author 박민혁
41	55	* @since 2024.03.13
42	56	*
43	57	* 계정 과목 정보 단일 조회
...	...	@@ -50,4 +64,31 @@
50	64	return resultMap;
51	65
52	66	}
	67	+
	68	+ /**
	69	+ * @author 박민혁
	70	+ * @since 2024.03.13
	71	+ *
	72	+ * 계정 과목 정보 추가 및 수정
	73	+ */
	74	+ @Override
	75	+ public CustomeResultMap mergeAccountData(AccountVO accountVO) throws Exception{
	76	+ CustomeResultMap resultMap = new CustomeResultMap();
	77	+ resultMap.getResultData().put("result", accountDAO.mergeAccountData(accountVO) == 1);
	78	+ return resultMap;
	79	+ }
	80	+
	81	+ /**
	82	+ * @author 박민혁
	83	+ * @since 2024.03.13
	84	+ *
	85	+ * 계정 과목 정보 삭제
	86	+ */
	87	+ @Override
	88	+ public CustomeResultMap deleteAccountData(String accode) throws Exception{
	89	+ CustomeResultMap resultMap = new CustomeResultMap();
	90	+ resultMap.getResultData().put("result", accountDAO.deleteAccountData(accode) == 1);
	91	+ return resultMap;
	92	+ }
	93	+
53	94	}

9a0ff3a

2344a1d

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


  *
  * 계정 과목 정보 VO
  */
-@Getter
-@Setter
+@Getter @Setter
 public class AccountVO {
     // 계정코드
     private String accode;

     // 동변불공제발생계정(계산서)
     private String bgcard;
     // 동변불공제발생계정(법인카드)
-    private String bggygu;
+    private String bgtaxx;
     // 차변금액발생여부(Y.발생)
     private String drmtgu;
     // 대변금액발생여부(Y.발생)

9a0ff3a

2344a1d

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.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;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor

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

         return map;
     }
 
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 추가 및 수정
+     */
+    @PostMapping(value = "/mergeAccountData.json")
+    public CustomeResultMap mergeAccountData(@RequestBody AccountVO accountVO) throws Exception{
+        CustomeResultMap map = accountService.mergeAccountData(accountVO);
+        return map;
+    }
+    /**
+     * @author 박민혁
+     * @since 2024.03.13
+     *
+     * 계정 과목 정보 삭제
+     */
+    @DeleteMapping(value = "/deleteAccountData.json")
+    public CustomeResultMap deleteAccountData(@RequestBody String accode) throws Exception{
+        CustomeResultMap map = accountService.deleteAccountData(accode);
+        return map;
+    }
+
 }

9a0ff3a

2344a1d

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


         <result property="blcard" column="BLCARD"/>
         <result property="blgygu" column="BLGYGU"/>
         <result property="bgcard" column="BGCARD"/>
-        <result property="bggygu" column="BGGYGU"/>
+        <result property="bgtaxx" column="BGTAXX"/>
         <result property="drmtgu" column="DRMTGU"/>
         <result property="crmtgu" column="CRMTGU"/>
         <result property="exchgu" column="EXCHGU"/>

         ORDER BY A.ACCODE
     </select>
 
+    <!-- 계정 과목 찾기 -->
+    <select id="searchAccountList" parameterType="AccountVO" resultMap="ac01001TResult">
+        SELECT A.*,
+               NVL(B.ACNAME, '') AS BLTXNM,
+               NVL(C.ACNAME, '') AS BLCDNM,
+               NVL(D.ACNAME, '') AS BGTXNM,
+               NVL(E.ACNAME, '') AS BGCDNM
+        FROM (
+            SELECT A.*,
+                   CASE WHEN A.DCGUBN = '1' THEN '1. 차변'
+                        WHEN A.DCGUBN = '2' THEN '2. 대변'
+                        ELSE A.DCGUBN
+                   END AS DCGUNM,
+                   CASE WHEN A.SEMUGU = '1' THEN '매출'
+                        WHEN A.SEMUGU = '2' THEN '매입'
+                        ELSE A.SEMUGU
+                   END AS SEMUNM
+            FROM AC01001T A
+        ) A
+        LEFT OUTER JOIN AC01001T B ON B.ACCODE = A.BLTAXX
+        LEFT OUTER JOIN AC01001T C ON C.ACCODE = A.BLCARD
+        LEFT OUTER JOIN AC01001T D ON D.ACCODE = A.BGTAXX
+        LEFT OUTER JOIN AC01001T E ON E.ACCODE = A.BGCARD
+    WHERE (A.ACCODE || A.ACNAME) LIKE '%' || #{acname} || '%'
+        ORDER BY A.ACCODE
+    </select>
+
     <!-- 계정 과목 단일 정보 확인 -->
-    <select id="getAccountData" parameterType="String" resultType="AccountVO">
+    <select id="getAccountData" parameterType="AccountVO" resultType="AccountVO">
         SELECT A.*
         FROM AC01001T A
-        WHERE A.ACCODE = #{ACCODE}
+        WHERE A.ACCODE = #{accode}
     </select>
 
     <!-- 계정 과목 정보 추가 및 수정 -->
+    <insert id="mergeAccountData" parameterType="AccountVO">
+        MERGE INTO AC01001T A
+        USING DUAL
+        ON (A.ACCODE = #{accode})
+        WHEN MATCHED THEN
+            UPDATE SET
+                A.ACNAME = #{acname},
+                A.DCGUBN = #{dcgubn},
+                A.DRMTGU = #{drmtgu},
+                A.CRMTGU = #{crmtgu},
+                A.BLGUBN = #{blgubn},
+                A.CUSTGU = #{custgu},
+                A.GYJNGU = #{gyjngu},
+                A.JUNGGU = #{junggu},
+                A.JDATGU = #{jdatgu},
+                A.SYBUGU = #{sybugu},
+                A.GOMTGU = #{gomtgu},
+                A.EXCHGU = #{exchgu},
+                A.PAPEGU = #{papegu},
+                A.JIBLGU = #{jiblgu},
+                A.BLTAXX = #{bltaxx},
+                A.BLCARD = #{blcard},
+                A.BGTAXX = #{bgtaxx},
+                A.BGCARD = #{bgcard},
+                A.BLGYGU = #{blgygu},
+                A.WONJGU = #{wonjgu},
+                A.SEMUGU = #{semugu},
+                A.IDUPTX = #{iduptx},
+                A.DTMUPT = SYSDATE,
+                A.TMLUPT = #{tmlupt}
+        WHEN NOT MATCHED THEN
+            INSERT (ACCODE, ACNAME, DCGUBN, DRMTGU, CRMTGU, BLGUBN, CUSTGU, GYJNGU, JUNGGU, JDATGU,
+                    SYBUGU, GOMTGU, EXCHGU, PAPEGU, JIBLGU, BLTAXX, BLCARD, BGTAXX, BGCARD,
+                    BLGYGU, WONJGU, SEMUGU, IDREGX, DTMREG, TMLREG, IDUPTX, DTMUPT, TMLUPT)
+            VALUES (#{accode}, #{acname}, #{dcgubn}, #{drmtgu}, #{crmtgu}, #{blgubn}, #{custgu},
+                    #{gyjngu}, #{junggu}, #{jdatgu}, #{sybugu}, #{gomtgu}, #{exchgu}, #{papegu},
+                    #{jiblgu}, #{bltaxx}, #{blcard}, #{bgtaxx}, #{bgcard}, #{blgygu}, #{wonjgu},
+                    #{semugu}, #{idregx}, SYSDATE, #{tmlreg}, #{iduptx}, SYSDATE, #{tmlupt})
+    </insert>
 
-
+    <!-- 계정 과목 정보 삭제 -->
+    <delete id="deleteAccountData" parameterType="String">
+        DELETE FROM AC01001T
+        WHERE ACCODE = #{accode}
+    </delete>
 </mapper>

Add a comment

Open 0
Closed 0

List

...	...	@@ -18,6 +18,14 @@
18	18
19	19	/**
20	20	* @author 박민혁
	21	+ * @since 2024.03.14
	22	+ *
	23	+ * 계정 과목 정보 검색
	24	+ */
	25	+ List<AccountVO> searchAccountList(AccountVO accountVO) throws Exception;
	26	+
	27	+ /**
	28	+ * @author 박민혁
21	29	* @since 2024.03.13
22	30	*
23	31	* 계정 과목 정보 단일 조회
...	...	@@ -32,4 +40,13 @@
32	40	*/
33	41	int mergeAccountData(AccountVO accountVO) throws Exception;
34	42
	43	+ /**
	44	+ * @author 박민혁
	45	+ * @since 2024.03.13
	46	+ *
	47	+ * 계정 과목 정보 삭제
	48	+ */
	49	+ int deleteAccountData(String accode) throws Exception;
	50	+
	51	+
35	52	}

...	...	@@ -3,6 +3,8 @@
3	3	import com.ajin.ajinerp.common.vo.CustomeResultMap;
4	4	import com.ajin.ajinerp.master.account.vo.AccountVO;
5	5
	6	+import java.util.List;
	7	+
6	8	public interface AccountService {
7	9	/**
8	10	* @author 박민혁
...	...	@@ -14,11 +16,34 @@
14	16
15	17	/**
16	18	* @author 박민혁
	19	+ * @since 2024.03.14
	20	+ *
	21	+ * 계정 과목 정보 검색
	22	+ */
	23	+ CustomeResultMap searchAccountList(AccountVO accountVO) throws Exception;
	24	+
	25	+ /**
	26	+ * @author 박민혁
17	27	* @since 2024.03.13
18	28	*
19	29	* 계정 과목 정보 단일 조회
20	30	*/
21	31	CustomeResultMap getAccountData(AccountVO accountVO) throws Exception;
22	32
	33	+ /**
	34	+ * @author 박민혁
	35	+ * @since 2024.03.13
	36	+ *
	37	+ * 계정 과목 정보 추가 및 수정
	38	+ */
	39	+ CustomeResultMap mergeAccountData(AccountVO accountVO) throws Exception;
	40	+
	41	+ /**
	42	+ * @author 박민혁
	43	+ * @since 2024.03.13
	44	+ *
	45	+ * 계정 과목 정보 삭제
	46	+ */
	47	+ CustomeResultMap deleteAccountData(String accode) throws Exception;
23	48
24	49	}

...	...	@@ -9,8 +9,7 @@
9	9	*
10	10	* 계정 과목 정보 VO
11	11	*/
12		-@Getter
13		-@Setter
	12	+@Getter @Setter
14	13	public class AccountVO {
15	14	// 계정코드
16	15	private String accode;
...	...	@@ -53,7 +52,7 @@
53	52	// 동변불공제발생계정(계산서)
54	53	private String bgcard;
55	54	// 동변불공제발생계정(법인카드)
56		- private String bggygu;
	55	+ private String bgtaxx;
57	56	// 차변금액발생여부(Y.발생)
58	57	private String drmtgu;
59	58	// 대변금액발생여부(Y.발생)

...	...	@@ -4,10 +4,7 @@
4	4	import com.ajin.ajinerp.master.account.service.AccountService;
5	5	import com.ajin.ajinerp.master.account.vo.AccountVO;
6	6	import lombok.RequiredArgsConstructor;
7		-import org.springframework.web.bind.annotation.GetMapping;
8		-import org.springframework.web.bind.annotation.PostMapping;
9		-import org.springframework.web.bind.annotation.RequestBody;
10		-import org.springframework.web.bind.annotation.RestController;
	7	+import org.springframework.web.bind.annotation.*;
11	8
12	9	@RestController
13	10	@RequiredArgsConstructor
...	...	@@ -28,6 +25,18 @@
28	25
29	26	/**
30	27	* @author 박민혁
	28	+ * @since 2024.03.14
	29	+ *
	30	+ * 계정 과목 정보 검색
	31	+ */
	32	+ @PostMapping(value = "/searchAccountList.json")
	33	+ public CustomeResultMap searchAccountList(@RequestBody AccountVO accountVO) throws Exception{
	34	+ CustomeResultMap map = accountService.searchAccountList(accountVO);
	35	+ return map;
	36	+ }
	37	+
	38	+ /**
	39	+ * @author 박민혁
31	40	* @since 2024.03.13
32	41	*
33	42	* 계정 과목 정보 단일 조회
...	...	@@ -38,4 +47,27 @@
38	47	return map;
39	48	}
40	49
	50	+ /**
	51	+ * @author 박민혁
	52	+ * @since 2024.03.13
	53	+ *
	54	+ * 계정 과목 정보 추가 및 수정
	55	+ */
	56	+ @PostMapping(value = "/mergeAccountData.json")
	57	+ public CustomeResultMap mergeAccountData(@RequestBody AccountVO accountVO) throws Exception{
	58	+ CustomeResultMap map = accountService.mergeAccountData(accountVO);
	59	+ return map;
	60	+ }
	61	+ /**
	62	+ * @author 박민혁
	63	+ * @since 2024.03.13
	64	+ *
	65	+ * 계정 과목 정보 삭제
	66	+ */
	67	+ @DeleteMapping(value = "/deleteAccountData.json")
	68	+ public CustomeResultMap deleteAccountData(@RequestBody String accode) throws Exception{
	69	+ CustomeResultMap map = accountService.deleteAccountData(accode);
	70	+ return map;
	71	+ }
	72	+
41	73	}

...	...	@@ -25,7 +25,7 @@
25	25	<result property="blcard" column="BLCARD"/>
26	26	<result property="blgygu" column="BLGYGU"/>
27	27	<result property="bgcard" column="BGCARD"/>
28		- <result property="bggygu" column="BGGYGU"/>
	28	+ <result property="bgtaxx" column="BGTAXX"/>
29	29	<result property="drmtgu" column="DRMTGU"/>
30	30	<result property="crmtgu" column="CRMTGU"/>
31	31	<result property="exchgu" column="EXCHGU"/>
...	...	@@ -64,14 +64,84 @@
64	64	ORDER BY A.ACCODE
65	65	</select>
66	66
	67	+ <!-- 계정 과목 찾기 -->
	68	+ <select id="searchAccountList" parameterType="AccountVO" resultMap="ac01001TResult">
	69	+ SELECT A.*,
	70	+ NVL(B.ACNAME, '') AS BLTXNM,
	71	+ NVL(C.ACNAME, '') AS BLCDNM,
	72	+ NVL(D.ACNAME, '') AS BGTXNM,
	73	+ NVL(E.ACNAME, '') AS BGCDNM
	74	+ FROM (
	75	+ SELECT A.*,
	76	+ CASE WHEN A.DCGUBN = '1' THEN '1. 차변'
	77	+ WHEN A.DCGUBN = '2' THEN '2. 대변'
	78	+ ELSE A.DCGUBN
	79	+ END AS DCGUNM,
	80	+ CASE WHEN A.SEMUGU = '1' THEN '매출'
	81	+ WHEN A.SEMUGU = '2' THEN '매입'
	82	+ ELSE A.SEMUGU
	83	+ END AS SEMUNM
	84	+ FROM AC01001T A
	85	+ ) A
	86	+ LEFT OUTER JOIN AC01001T B ON B.ACCODE = A.BLTAXX
	87	+ LEFT OUTER JOIN AC01001T C ON C.ACCODE = A.BLCARD
	88	+ LEFT OUTER JOIN AC01001T D ON D.ACCODE = A.BGTAXX
	89	+ LEFT OUTER JOIN AC01001T E ON E.ACCODE = A.BGCARD
	90	+ WHERE (A.ACCODE \|\| A.ACNAME) LIKE '%' \|\| #{acname} \|\| '%'
	91	+ ORDER BY A.ACCODE
	92	+ </select>
	93	+
67	94	<!-- 계정 과목 단일 정보 확인 -->
68		- <select id="getAccountData" parameterType="String" resultType="AccountVO">
	95	+ <select id="getAccountData" parameterType="AccountVO" resultType="AccountVO">
69	96	SELECT A.*
70	97	FROM AC01001T A
71		- WHERE A.ACCODE = #{ACCODE}
	98	+ WHERE A.ACCODE = #{accode}
72	99	</select>
73	100
74	101	<!-- 계정 과목 정보 추가 및 수정 -->
	102	+ <insert id="mergeAccountData" parameterType="AccountVO">
	103	+ MERGE INTO AC01001T A
	104	+ USING DUAL
	105	+ ON (A.ACCODE = #{accode})
	106	+ WHEN MATCHED THEN
	107	+ UPDATE SET
	108	+ A.ACNAME = #{acname},
	109	+ A.DCGUBN = #{dcgubn},
	110	+ A.DRMTGU = #{drmtgu},
	111	+ A.CRMTGU = #{crmtgu},
	112	+ A.BLGUBN = #{blgubn},
	113	+ A.CUSTGU = #{custgu},
	114	+ A.GYJNGU = #{gyjngu},
	115	+ A.JUNGGU = #{junggu},
	116	+ A.JDATGU = #{jdatgu},
	117	+ A.SYBUGU = #{sybugu},
	118	+ A.GOMTGU = #{gomtgu},
	119	+ A.EXCHGU = #{exchgu},
	120	+ A.PAPEGU = #{papegu},
	121	+ A.JIBLGU = #{jiblgu},
	122	+ A.BLTAXX = #{bltaxx},
	123	+ A.BLCARD = #{blcard},
	124	+ A.BGTAXX = #{bgtaxx},
	125	+ A.BGCARD = #{bgcard},
	126	+ A.BLGYGU = #{blgygu},
	127	+ A.WONJGU = #{wonjgu},
	128	+ A.SEMUGU = #{semugu},
	129	+ A.IDUPTX = #{iduptx},
	130	+ A.DTMUPT = SYSDATE,
	131	+ A.TMLUPT = #{tmlupt}
	132	+ WHEN NOT MATCHED THEN
	133	+ INSERT (ACCODE, ACNAME, DCGUBN, DRMTGU, CRMTGU, BLGUBN, CUSTGU, GYJNGU, JUNGGU, JDATGU,
	134	+ SYBUGU, GOMTGU, EXCHGU, PAPEGU, JIBLGU, BLTAXX, BLCARD, BGTAXX, BGCARD,
	135	+ BLGYGU, WONJGU, SEMUGU, IDREGX, DTMREG, TMLREG, IDUPTX, DTMUPT, TMLUPT)
	136	+ VALUES (#{accode}, #{acname}, #{dcgubn}, #{drmtgu}, #{crmtgu}, #{blgubn}, #{custgu},
	137	+ #{gyjngu}, #{junggu}, #{jdatgu}, #{sybugu}, #{gomtgu}, #{exchgu}, #{papegu},
	138	+ #{jiblgu}, #{bltaxx}, #{blcard}, #{bgtaxx}, #{bgcard}, #{blgygu}, #{wonjgu},
	139	+ #{semugu}, #{idregx}, SYSDATE, #{tmlreg}, #{iduptx}, SYSDATE, #{tmlupt})
	140	+ </insert>
75	141
76		-
	142	+ <!-- 계정 과목 정보 삭제 -->
	143	+ <delete id="deleteAccountData" parameterType="String">
	144	+ DELETE FROM AC01001T
	145	+ WHERE ACCODE = #{accode}
	146	+ </delete>
77	147	</mapper> (파일 끝에 줄바꿈 문자 없음)

Delete comment