Merge remote-tracking branch 'origin/dev' into dev

00fbb386 · 江和松 · 855a002b · aee1cf10 · 00fbb386 · 00fbb386
Commit 00fbb386 authored Jul 01, 2024 by 江和松
4 changed files
--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW051.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW051.java
--- a/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW052.java
+++ b/src/main/java/com/baosight/hggp/hg/cw/domain/HGCW052.java
--- a/src/main/java/com/baosight/hggp/hg/cw/sql/HGCW051.xml
+++ b/src/main/java/com/baosight/hggp/hg/cw/sql/HGCW051.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-06-26 15:09:24
+		Generate time : 2024-07-01 10:27:27
   		Version :  1.0
 		schema : hggp
 		tableName : HGCW051
@@ -16,7 +16,9 @@
 		 COMPANY_NAME  VARCHAR, 
 		 YEAR  VARCHAR   NOT NULL, 
 		 MONTH  VARCHAR   NOT NULL, 
-		 AMOUNT  DECIMAL
+		 AMOUNT  DECIMAL, 
+		 ACCOUNT  VARCHAR, 
+		 DEP_CODE  VARCHAR
 	-->
 <sqlMap namespace="HGCW051">

@@ -60,6 +62,12 @@
 		<isNotEmpty prepend=" AND " property="amount">
 			AMOUNT = #amount#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="account">
+			ACCOUNT = #account#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
 	</sql>

 	<select id="query" parameterClass="java.util.HashMap"
@@ -129,24 +137,32 @@
 		<isNotEmpty prepend=" AND " property="amount">
 			AMOUNT = #amount#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="account">
+			ACCOUNT = #account#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
 	-->

 	<insert id="insert">
 		INSERT INTO ${hggpSchema}.HGCW051 (ID,
-										CREATED_BY,  <!-- è®°å½•åˆ›å»ºè€… -->
-										CREATED_NAME,  <!-- è®°å½•åˆ›å»ºå��ç§° -->
-										CREATED_TIME,  <!-- è®°å½•åˆ›å»ºæ—¶é—´ -->
-										UPDATED_BY,  <!-- è®°å½•ä¿®æ”¹è€… -->
-										UPDATED_NAME,  <!-- è®°å½•ä¿®æ”¹å��ç§° -->
-										UPDATED_TIME,  <!-- è®°å½•ä¿®æ”¹æ—¶é—´ -->
-										DELETE_FLAG,  <!-- 0-æœªåˆ é™¤ï¼Œ1-å·²åˆ é™¤ -->
-										COMPANY_CODE,  <!-- å…¬å�¸ç¼–ç � -->
-										COMPANY_NAME,  <!-- å…¬å�¸å��ç§° -->
-										YEAR,  <!-- å¹´ä»½ -->
-										MONTH,  <!-- æœˆä»½ -->
-										AMOUNT  <!-- è´¹ç”¨é‡‘é¢� -->
+										CREATED_BY,  <!-- 记录创建者 -->
+										CREATED_NAME,  <!-- 记录创建名称 -->
+										CREATED_TIME,  <!-- 记录创建时间 -->
+										UPDATED_BY,  <!-- 记录修改者 -->
+										UPDATED_NAME,  <!-- 记录修改名称 -->
+										UPDATED_TIME,  <!-- 记录修改时间 -->
+										DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
+										COMPANY_CODE,  <!-- 公司编码 -->
+										COMPANY_NAME,  <!-- 公司名称 -->
+										YEAR,  <!-- 年份 -->
+										MONTH,  <!-- 月份 -->
+										AMOUNT,  <!-- 费用金额 -->
+										ACCOUNT,  <!-- 企业编码 -->
+										DEP_CODE  <!-- 部门编码 -->
 										)
-	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#)
+	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #account#, #depCode#)
 	</insert>

 	<delete id="delete">
@@ -157,18 +173,20 @@
 	<update id="update">
 		UPDATE ${hggpSchema}.HGCW051
 		SET
-					CREATED_BY	= #createdBy#,   <!-- è®°å½•åˆ›å»ºè€… -->
-					CREATED_NAME	= #createdName#,   <!-- è®°å½•åˆ›å»ºå��ç§° -->
-					CREATED_TIME	= #createdTime#,   <!-- è®°å½•åˆ›å»ºæ—¶é—´ -->
-					UPDATED_BY	= #updatedBy#,   <!-- è®°å½•ä¿®æ”¹è€… -->
-					UPDATED_NAME	= #updatedName#,   <!-- è®°å½•ä¿®æ”¹å��ç§° -->
-					UPDATED_TIME	= #updatedTime#,   <!-- è®°å½•ä¿®æ”¹æ—¶é—´ -->
-					DELETE_FLAG	= #deleteFlag#,   <!-- 0-æœªåˆ é™¤ï¼Œ1-å·²åˆ é™¤ -->
-					COMPANY_CODE	= #companyCode#,   <!-- å…¬å�¸ç¼–ç � -->
-					COMPANY_NAME	= #companyName#,   <!-- å…¬å�¸å��ç§° -->
-					YEAR	= #year#,   <!-- å¹´ä»½ -->
-					MONTH	= #month#,   <!-- æœˆä»½ -->
-					AMOUNT	= #amount#  <!-- è´¹ç”¨é‡‘é¢� -->
+					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
+					CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
+					CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
+					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+					DELETE_FLAG	= #deleteFlag#,   <!-- 0-未删除，1-已删除 -->
+					COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
+					COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
+					YEAR	= #year#,   <!-- 年份 -->
+					MONTH	= #month#,   <!-- 月份 -->
+					AMOUNT	= #amount#,   <!-- 费用金额 -->
+					ACCOUNT	= #account#,   <!-- 企业编码 -->
+					DEP_CODE	= #depCode#  <!-- 部门编码 -->
 			WHERE
 			ID = #id#
 	</update>

--- a/src/main/java/com/baosight/hggp/hg/cw/sql/HGCW052.xml
+++ b/src/main/java/com/baosight/hggp/hg/cw/sql/HGCW052.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-06-26 15:09:39
+		Generate time : 2024-07-01 10:27:33
   		Version :  1.0
 		schema : hggp
 		tableName : HGCW052
@@ -22,7 +22,9 @@
 		 COST_ITEM  VARCHAR, 
 		 ITEM_NAME  VARCHAR, 
 		 ITEM_CODE  VARCHAR, 
-		 IS_SHARE  VARCHAR
+		 IS_SHARE  VARCHAR, 
+		 ACCOUNT  VARCHAR, 
+		 DEP_CODE  VARCHAR
 	-->
 <sqlMap namespace="HGCW052">

@@ -84,32 +86,40 @@
 		<isNotEmpty prepend=" AND " property="isShare">
 			IS_SHARE = #isShare#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="account">
+			ACCOUNT = #account#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
 	</sql>

 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.cw.domain.HGCW052">
 		SELECT
 				ID	as "id",  
-        CREATED_BY as "createdBy",  <!-- è®°å½•åˆ›å»ºè€… -->
-        CREATED_NAME as "createdName",  <!-- è®°å½•åˆ›å»ºå��ç§° -->
-        CREATED_TIME as "createdTime",  <!-- è®°å½•åˆ›å»ºæ—¶é—´ -->
-        UPDATED_BY as "updatedBy",  <!-- è®°å½•ä¿®æ”¹è€… -->
-        UPDATED_NAME as "updatedName",  <!-- è®°å½•ä¿®æ”¹å��ç§° -->
-        UPDATED_TIME as "updatedTime",  <!-- è®°å½•ä¿®æ”¹æ—¶é—´ -->
-        DELETE_FLAG as "deleteFlag",  <!-- 0-æœªåˆ é™¤ï¼Œ1-å·²åˆ é™¤ -->
-        COMPANY_CODE as "companyCode",  <!-- å…¬å�¸ç¼–ç � -->
-        COMPANY_NAME as "companyName",  <!-- å…¬å�¸å��ç§° -->
-        YEAR as "year",  <!-- å¹´ä»½ -->
-        MONTH as "month",  <!-- æœˆä»½ -->
-        AMOUNT as "amount",  <!-- è´¹ç”¨é‡‘é¢� -->
-        HGCW051_ID as "hgcw051Id",  <!-- ä¸»è¡¨ID -->
-        COST_TYPE as "costType",  <!-- è´¹ç”¨ç±»åž‹ -->
-        COST_ITEM as "costItem",  <!-- è´¹ç”¨é¡¹ -->
-        ITEM_NAME as "itemName",  <!-- é¡¹ç›®å��ç§° -->
-        ITEM_CODE as "itemCode",  <!-- é¡¹ç›®ç¼–å�· -->
-        IS_SHARE as "isShare" <!-- æ˜¯å�¦åˆ†æ‘Šè´¹ç”¨ -->
+				CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+				CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+				CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+				UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+				UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+				UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+				DELETE_FLAG	as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
+				COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+				COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+				YEAR	as "year",  <!-- 年份 -->
+				MONTH	as "month",  <!-- 月份 -->
+				AMOUNT	as "amount",  <!-- 费用金额 -->
+				HGCW051_ID	as "hgcw051Id",  <!-- 主表ID -->
+				COST_TYPE	as "costType",  <!-- 费用类型 -->
+				COST_ITEM	as "costItem",  <!-- 费用项 -->
+				ITEM_NAME	as "itemName",  <!-- 项目名称 -->
+				ITEM_CODE	as "itemCode",  <!-- 项目编号 -->
+				IS_SHARE	as "isShare",  <!-- 是否分摊费用 -->
+				ACCOUNT	as "account",  <!-- 企业编码 -->
+				DEP_CODE	as "depCode" <!-- 部门编码 -->
 		FROM ${hggpSchema}.HGCW052 WHERE 1=1
-        <include refid="condition"/>
+        <include refid="condition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
    		  $orderBy$
@@ -140,7 +150,7 @@

 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGCW052 WHERE 1=1
-        <include refid="condition"/>
+    <include refid="condition" />
 	</select>

 	<!--
@@ -201,61 +211,68 @@
 		<isNotEmpty prepend=" AND " property="isShare">
 			IS_SHARE = #isShare#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="account">
+			ACCOUNT = #account#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
 	-->

 	<insert id="insert">
 		INSERT INTO ${hggpSchema}.HGCW052 (ID,
-        CREATED_BY,  <!-- è®°å½•åˆ›å»ºè€… -->
-        CREATED_NAME,  <!-- è®°å½•åˆ›å»ºå��ç§° -->
-        CREATED_TIME,  <!-- è®°å½•åˆ›å»ºæ—¶é—´ -->
-        UPDATED_BY,  <!-- è®°å½•ä¿®æ”¹è€… -->
-        UPDATED_NAME,  <!-- è®°å½•ä¿®æ”¹å��ç§° -->
-        UPDATED_TIME,  <!-- è®°å½•ä¿®æ”¹æ—¶é—´ -->
-        DELETE_FLAG,  <!-- 0-æœªåˆ é™¤ï¼Œ1-å·²åˆ é™¤ -->
-        COMPANY_CODE,  <!-- å…¬å�¸ç¼–ç � -->
-        COMPANY_NAME,  <!-- å…¬å�¸å��ç§° -->
-        YEAR,  <!-- å¹´ä»½ -->
-        MONTH,  <!-- æœˆä»½ -->
-        AMOUNT,  <!-- è´¹ç”¨é‡‘é¢� -->
-        HGCW051_ID,  <!-- ä¸»è¡¨ID -->
-        COST_TYPE,  <!-- è´¹ç”¨ç±»åž‹ -->
-        COST_ITEM,  <!-- è´¹ç”¨é¡¹ -->
-        ITEM_NAME,  <!-- é¡¹ç›®å��ç§° -->
-        ITEM_CODE,  <!-- é¡¹ç›®ç¼–å�· -->
-        IS_SHARE  <!-- æ˜¯å�¦åˆ†æ‘Šè´¹ç”¨ -->
+										CREATED_BY,  <!-- 记录创建者 -->
+										CREATED_NAME,  <!-- 记录创建名称 -->
+										CREATED_TIME,  <!-- 记录创建时间 -->
+										UPDATED_BY,  <!-- 记录修改者 -->
+										UPDATED_NAME,  <!-- 记录修改名称 -->
+										UPDATED_TIME,  <!-- 记录修改时间 -->
+										DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
+										COMPANY_CODE,  <!-- 公司编码 -->
+										COMPANY_NAME,  <!-- 公司名称 -->
+										YEAR,  <!-- 年份 -->
+										MONTH,  <!-- 月份 -->
+										AMOUNT,  <!-- 费用金额 -->
+										HGCW051_ID,  <!-- 主表ID -->
+										COST_TYPE,  <!-- 费用类型 -->
+										COST_ITEM,  <!-- 费用项 -->
+										ITEM_NAME,  <!-- 项目名称 -->
+										ITEM_CODE,  <!-- 项目编号 -->
+										IS_SHARE,  <!-- 是否分摊费用 -->
+										ACCOUNT,  <!-- 企业编码 -->
+										DEP_CODE  <!-- 部门编码 -->
 										)
-        VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
-        #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #hgcw051Id#, #costType#, #costItem#,
-        #itemName#, #itemCode#, #isShare#)
+	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #hgcw051Id#, #costType#, #costItem#, #itemName#, #itemCode#, #isShare#, #account#, #depCode#)
 	</insert>

 	<delete id="delete">
-        DELETE
-        FROM ${hggpSchema}.HGCW052
-        WHERE ID = #id#
+		DELETE FROM ${hggpSchema}.HGCW052 WHERE
+			ID = #id#
 	</delete>

 	<update id="update">
 		UPDATE ${hggpSchema}.HGCW052
 		SET
-        CREATED_BY = #createdBy#,   <!-- è®°å½•åˆ›å»ºè€… -->
-        CREATED_NAME = #createdName#,   <!-- è®°å½•åˆ›å»ºå��ç§° -->
-        CREATED_TIME = #createdTime#,   <!-- è®°å½•åˆ›å»ºæ—¶é—´ -->
-        UPDATED_BY = #updatedBy#,   <!-- è®°å½•ä¿®æ”¹è€… -->
-        UPDATED_NAME = #updatedName#,   <!-- è®°å½•ä¿®æ”¹å��ç§° -->
-        UPDATED_TIME = #updatedTime#,   <!-- è®°å½•ä¿®æ”¹æ—¶é—´ -->
-        DELETE_FLAG = #deleteFlag#,   <!-- 0-æœªåˆ é™¤ï¼Œ1-å·²åˆ é™¤ -->
-        COMPANY_CODE = #companyCode#,   <!-- å…¬å�¸ç¼–ç � -->
-        COMPANY_NAME = #companyName#,   <!-- å…¬å�¸å��ç§° -->
-        YEAR = #year#,   <!-- å¹´ä»½ -->
-        MONTH = #month#,   <!-- æœˆä»½ -->
-        AMOUNT = #amount#,   <!-- è´¹ç”¨é‡‘é¢� -->
-        HGCW051_ID = #hgcw051Id#,   <!-- ä¸»è¡¨ID -->
-        COST_TYPE = #costType#,   <!-- è´¹ç”¨ç±»åž‹ -->
-        COST_ITEM = #costItem#,   <!-- è´¹ç”¨é¡¹ -->
-        ITEM_NAME = #itemName#,   <!-- é¡¹ç›®å��ç§° -->
-        ITEM_CODE = #itemCode#,   <!-- é¡¹ç›®ç¼–å�· -->
-        IS_SHARE = #isShare#  <!-- æ˜¯å�¦åˆ†æ‘Šè´¹ç”¨ -->
+					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
+					CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
+					CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
+					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+					DELETE_FLAG	= #deleteFlag#,   <!-- 0-未删除，1-已删除 -->
+					COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
+					COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
+					YEAR	= #year#,   <!-- 年份 -->
+					MONTH	= #month#,   <!-- 月份 -->
+					AMOUNT	= #amount#,   <!-- 费用金额 -->
+					HGCW051_ID	= #hgcw051Id#,   <!-- 主表ID -->
+					COST_TYPE	= #costType#,   <!-- 费用类型 -->
+					COST_ITEM	= #costItem#,   <!-- 费用项 -->
+					ITEM_NAME	= #itemName#,   <!-- 项目名称 -->
+					ITEM_CODE	= #itemCode#,   <!-- 项目编号 -->
+					IS_SHARE	= #isShare#,   <!-- 是否分摊费用 -->
+					ACCOUNT	= #account#,   <!-- 企业编码 -->
+					DEP_CODE	= #depCode#  <!-- 部门编码 -->
 			WHERE
 			ID = #id#
 	</update>