钱智社保报表问题

# Conflicts:
#	src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
#	src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
#	src/com/engine/salary/service/SIAccountService.java
#	src/com/engine/salary/service/SalaryAcctRecordService.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/web/SalaryAcctController.java
#	src/com/engine/salary/web/TaxDeclarationController.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java

hs_err_pid14080.log

@@ -0,0 +1,227 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 266338304 bytes for G1 virtual space
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
+#     placed in the first 32GB address space. The Java Heap base address is the
+#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
+#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (os_windows.cpp:3760), pid=14080, tid=28956
+#
+# JRE version:  (17.0.5+1) (build )
+# Java VM: OpenJDK 64-Bit Server VM (17.0.5+1-b653.25, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: git4idea.http.GitAskPassApp Username for 'http://221.226.25.34:3000': 
+
+Host: 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz, 8 cores, 15G,  Windows 11 , 64 bit Build 22621 (10.0.22621.4391)
+Time: Fri Feb 14 15:22:37 2025  Windows 11 , 64 bit Build 22621 (10.0.22621.4391) elapsed time: 0.013680 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x000002b63ab44860):  JavaThread "Unknown thread" [_thread_in_vm, id=28956, stack(0x000000e509200000,0x000000e509300000)]
+
+Stack: [0x000000e509200000,0x000000e509300000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x6830ca]
+V  [jvm.dll+0x83f4c4]
+V  [jvm.dll+0x840c6e]
+V  [jvm.dll+0x8412d3]
+V  [jvm.dll+0x2490b5]
+V  [jvm.dll+0x67ff99]
+V  [jvm.dll+0x6744aa]
+V  [jvm.dll+0x308f2b]
+V  [jvm.dll+0x3103e6]
+V  [jvm.dll+0x36013e]
+V  [jvm.dll+0x36036f]
+V  [jvm.dll+0x2df018]
+V  [jvm.dll+0x2dff84]
+V  [jvm.dll+0x810d91]
+V  [jvm.dll+0x36df31]
+V  [jvm.dll+0x7f028c]
+V  [jvm.dll+0x3f0cbf]
+V  [jvm.dll+0x3f2801]
+C  [jli.dll+0x526b]
+C  [ucrtbase.dll+0x29333]
+C  [KERNEL32.DLL+0x1259d]
+C  [ntdll.dll+0x5af38]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x00007ffafaf88f98, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x000002b63abaf200 GCTaskThread "GC Thread#0" [stack: 0x000000e509300000,0x000000e509400000] [id=15580]
+  0x000002b63abbfed0 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000e509400000,0x000000e509500000] [id=11804]
+  0x000002b63abc08e0 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000e509500000,0x000000e509600000] [id=7940]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffafa73fbd7]
+
+VM state: not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x000002b63ab3f8e0] Heap_lock - owner thread: 0x000002b63ab44860
+
+Heap address: 0x0000000702600000, size: 4058 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
+
+CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 0.
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
+
+GC Precious Log:
+<Empty>
+
+Heap:
+ garbage-first heap   total 0K, used 0K [0x0000000702600000, 0x0000000800000000)
+  region size 2048K, 0 young (0K), 0 survivors (0K)
+
+[error occurred during error reporting (printing heap information), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffafab2cd59]
+
+GC Heap History (0 events):
+No events
+
+Dll operation events (1 events):
+Event: 0.009 Loaded shared library C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\java.dll
+
+Deoptimization events (0 events):
+No events
+
+Classes unloaded (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+VM Operations (0 events):
+No events
+
+Events (0 events):
+No events
+
+
+Dynamic libraries:
+0x00007ff7ee970000 - 0x00007ff7ee97a000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\java.exe
+0x00007ffb54c10000 - 0x00007ffb54e27000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffb53830000 - 0x00007ffb538f4000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffb51ff0000 - 0x00007ffb523aa000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffb525d0000 - 0x00007ffb526e1000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffafa410000 - 0x00007ffafa427000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\jli.dll
+0x00007ffb396f0000 - 0x00007ffb3970b000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\VCRUNTIME140.dll
+0x00007ffb53f10000 - 0x00007ffb540be000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffb525a0000 - 0x00007ffb525c6000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffb3d6c0000 - 0x00007ffb3d952000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.4541_none_2710d1c57384c085\COMCTL32.dll
+0x00007ffb52b20000 - 0x00007ffb52b49000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffb52ef0000 - 0x00007ffb52f97000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffb51ed0000 - 0x00007ffb51feb000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffb52860000 - 0x00007ffb528fa000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffb540c0000 - 0x00007ffb540f1000 	C:\WINDOWS\System32\IMM32.DLL
+0x00007ffb423a0000 - 0x00007ffb423ac000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\vcruntime140_1.dll
+0x00007ffae6920000 - 0x00007ffae69ad000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\msvcp140.dll
+0x00007ffafa450000 - 0x00007ffafb0bb000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\server\jvm.dll
+0x00007ffb53bc0000 - 0x00007ffb53c72000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffb53e50000 - 0x00007ffb53ef7000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffb524b0000 - 0x00007ffb524d8000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffb53d30000 - 0x00007ffb53e44000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffb4a3c0000 - 0x00007ffb4a3f4000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffb36550000 - 0x00007ffb36559000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffb4cfe0000 - 0x00007ffb4cfea000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffb52d00000 - 0x00007ffb52d71000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffb50f60000 - 0x00007ffb50f78000 	C:\WINDOWS\SYSTEM32\kernel.appcore.dll
+0x00007ffb17c80000 - 0x00007ffb17c8a000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\jimage.dll
+0x00007ffb4f4d0000 - 0x00007ffb4f702000 	C:\WINDOWS\SYSTEM32\DBGHELP.DLL
+0x00007ffb54680000 - 0x00007ffb54a11000 	C:\WINDOWS\System32\combase.dll
+0x00007ffb52c20000 - 0x00007ffb52cf7000 	C:\WINDOWS\System32\OLEAUT32.dll
+0x00007ffb4d360000 - 0x00007ffb4d392000 	C:\WINDOWS\SYSTEM32\dbgcore.DLL
+0x00007ffb523b0000 - 0x00007ffb5242b000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffb16db0000 - 0x00007ffb16dd5000 	C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\java.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.4541_none_2710d1c57384c085;C:\Program Files\JetBrains\IntelliJ IDEA 2022.1.4\jbr\bin\server
+
+VM Arguments:
+java_command: git4idea.http.GitAskPassApp Username for 'http://221.226.25.34:3000': 
+java_class_path (initial): C:/Program Files/JetBrains/IntelliJ IDEA 2022.1.4/plugins/vcs-git/lib/git4idea-rt.jar;C:/Program Files/JetBrains/IntelliJ IDEA 2022.1.4/lib/externalProcess-rt.jar;C:/Program Files/JetBrains/IntelliJ IDEA 2022.1.4/lib/app.jar;C:/Program Files/JetBrains/IntelliJ IDEA 2022.1.4/lib/3rd-party-rt.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 2                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 8                                         {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4255121408                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
+   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5839372                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122909434                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122909434                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+   size_t SoftMaxHeapSize                          = 4255121408                             {manageable} {ergonomic}
+     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+JAVA_HOME=C:\Program Files\Java\jdk1.8.0_341
+CLASSPATH=D:\WEAVER\Resin\lib\resin.jar
+PATH=D:\Develop\Git\mingw64\libexec\git-core;D:\Develop\Git\mingw64\libexec\git-core;D:\Develop\Git\mingw64\bin;D:\Develop\Git\usr\bin;C:\Users\Harryxzy\bin;C:\Program Files (x86)\Microsoft SQL Server\100\DTS\Binn;C:\Program Files\Java\jre1.8.0_341\bin;C:\Program Files\Java\jdk1.8.0_341\bin;D:\Develop\apache-maven-3.8.1\bin;C:\Program Files\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\VMware\VMware Workstation\bin;D:\oracle\product\11.2.0\dbhome_1\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn;C:\Program Files\Microsoft SQL Server\100\Tools\Binn;C:\Program Files\Microsoft SQL Server\100\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn\VSShell\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\PrivateAssemblies;D:\Develop\Git\cmd;C:\Program Files (x86)\NetSarang\Xshell 7;C:\Program Files (x86)\NetSarang\Xftp 7;C:\Program Files\nodejs;C:\Program Files\Docker\Docker\resources\bin;C:\Users\Public\Desktop;D:\MySQL8.0.21\bin;E:\Python\Python313\Scripts;E:\Python\Python313;C:\Program Files\MySQL\MySQL Shell 8.0\bin;C:\Users\Harryxzy\AppData\Local\Microsoft\WindowsApps;D:\Develop\Microsoft VS Code\bin;C:\Users\Harryxzy\AppData\Roaming\npm;C:\Users\Harryxzy\AppData\Local\Programs\Fiddler
+USERNAME=Harryxzy
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+TERM=xterm-256color
+TMPDIR=C:\Users\Harryxzy\AppData\Local\Temp
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 140 Stepping 1, GenuineIntel
+TMP=C:\Users\Harryxzy\AppData\Local\Temp
+TEMP=C:\Users\Harryxzy\AppData\Local\Temp
+
+
+
+---------------  S Y S T E M  ---------------
+
+OS:
+ Windows 11 , 64 bit Build 22621 (10.0.22621.4391)
+OS uptime: 1 days 6:11 hours
+Hyper-V role detected
+
+CPU: total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 140 stepping 1 microcode 0xba, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, avx512f, avx512dq, avx512cd, avx512bw, avx512vl, sha, fma, vzeroupper, avx512_vpopcntdq, avx512_vpclmulqdq, avx512_vaes, avx512_vnni, clflush, clflushopt, clwb, avx512_vbmi2, avx512_vbmi, hv
+
+Memory: 4k page, system-wide physical 16226M (372M free)
+TotalPageFile size 51523M (AvailPageFile size 115M)
+current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
+current process commit charge ("private bytes"): 60M, peak: 314M
+
+vm_info: OpenJDK 64-Bit Server VM (17.0.5+1-b653.25) for windows-amd64 JRE (17.0.5+1-b653.25), built on 2023-01-04 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
+
+END.

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.2504.01
+version=3.0.6.2510.01.ts
 openFormulaForcedEditing=false

resource/WEB-INF/salaryoptconfig.xml

@@ -39,6 +39,11 @@
             <opt name="管理" key="admin"/>
         </page>
 
+        <page name="人员报送" key="employeeDeclare">
+            <opt name="查询" key="query"/>
+            <opt name="管理" key="admin"/>
+        </page>
+
         <page name="个税申报" key="taxDeclaration">
             <opt name="查询" key="query"/>
             <opt name="管理" key="admin"/>

resource/sqlupgrade/DM/sql202307180103.sql

@@ -0,0 +1,34 @@
+create table hrsa_tax_declare_api_profile
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar(10),
+  api_profile int
+);
+/
+
+create index id_tenant_key_22b215db on hrsa_tax_declare_api_profile(tenant_key);
+/
+
+create table hrsa_tax_payment_request
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int default 0,
+    tenant_key varchar(10),
+    tax_agent_id number not null,
+    tax_declare_record_id number,
+    tax_year_month date not null,
+    request_id varchar(50) not null,
+    request_type int not null
+);
+/
+
+create index id_tenant_key_bcb610c7 on hrsa_tax_payment_request(tenant_key);
+/
+

resource/sqlupgrade/DM/sql202307180203.sql

@@ -0,0 +1,38 @@
+create table hrsa_tax_declare_api_config
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  host varchar2(255),
+  app_key varchar2(255),
+  app_secret varchar2(255)
+);
+/
+
+create unique index idx_tenant_key_api_a6f21b46 on hrsa_tax_declare_api_config(tenant_key);
+/
+
+alter table hrsa_tax_declare_api_config modify host not null;
+/
+
+alter table hrsa_tax_declare_api_config modify app_key not null;
+/
+
+alter table hrsa_tax_declare_api_config modify app_secret not null;
+/
+
+alter table hrsa_tax_declare_api_config add enable_use int;
+/
+
+alter table hrsa_tax_declare_api_config add totality number;
+/
+
+alter table hrsa_tax_declare_api_config add remain number;
+/
+
+alter table hrsa_tax_declare_api_config add last_update_time date;
+/
+

resource/sqlupgrade/DM/sql202307180403.sql

@@ -0,0 +1,31 @@
+create table hrsa_tax_agent_tax_return
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number not null,
+  tax_code varchar2(50) not null,
+  tax_registration_number varchar2(50) ,
+  department_code varchar2(50),
+  department_name varchar2(50),
+  nation varchar2(50),
+  province varchar2(50),
+  city varchar2(50),
+  area_code varchar2(50) not null,
+  password_type int not null,
+  real_account varchar2(50) ,
+  pwd varchar2(50) not null,
+  check_status int not null,
+  fail_reason varchar2(255)
+);
+/
+
+create index id_tenant_key_tax_return on hrsa_tax_agent_tax_return(tenant_key);
+/
+
+create unique index id_tax_agent_id_tax_return on hrsa_tax_agent_tax_return(tax_agent_id);
+/
+

resource/sqlupgrade/DM/sql202308080603.sql

@@ -0,0 +1,51 @@
+create table hrsa_employee_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  request_id varchar2(100)
+);
+/
+
+create table hrsa_employee_declare
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  employee_id number,
+  employee_type number,
+  employee_name varchar2(100),
+  job_num varchar2(100),
+  card_type number,
+  card_num varchar2(100),
+  gender varchar2(100),
+  birthday date,
+  employment_status number,
+  mobile varchar2(100),
+  employment_type number,
+  employment_first_year varchar2(100),
+  employment_date date,
+  dismiss_date date,
+  disability number,
+  disability_card_no varchar2(100),
+  lonely_old number,
+  martyr_dependents number,
+  martyr_dependents_card_no varchar2(100),
+  deduct_expenses number,
+  successfully_declared number,
+  new_employee_info number,
+  declare_status number,
+  declare_error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/DM/sql202308090303.sql

@@ -0,0 +1,36 @@
+create table hrsa_tax_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  salary_month date,
+  tax_cycle date,
+  remark varchar2(1000),
+  request_id varchar2(100),
+  tax_declare_type number,
+  tax_declare_status number
+);
+/
+
+alter table hrsa_tax_declare_record add display_update_icon number;
+/
+
+alter table hrsa_tax_declare_record add tax_pay_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add person_num int;
+/
+
+alter table hrsa_tax_declare_record add tax_declare_error_msg varchar2(1000);
+/
+
+alter table hrsa_tax_declare_record add tax_paid_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add tax_pure_paid_amount varchar2(255);
+/
+

resource/sqlupgrade/DM/sql202308100803.sql

@@ -0,0 +1,15 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/DM/sql202308110103.sql

@@ -0,0 +1,39 @@
+create table hrsa_tax_report_column
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_report_type varchar2(100),
+  income_category varchar2(100),
+  report_column_name varchar2(100),
+  report_column_data_index varchar2(100)
+);
+/
+
+create table hrsa_sob_tax_report_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  report_column_data_index varchar2(100),
+  salary_item_id number
+);
+/
+
+alter table hrsa_tax_report_column add data_type varchar2(100);
+/
+
+alter table hrsa_tax_report_column add request_param_key varchar2(100);
+/
+
+alter table hrsa_tax_report_column add report_column_label varchar2(100);
+/
+

resource/sqlupgrade/DM/sql202308110203.sql

@@ -0,0 +1,18 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+
+alter table hrsa_tax_declare_fail add income_category varchar2(100);
+/
+

resource/sqlupgrade/DM/sql202308110303.sql

@@ -0,0 +1,18 @@
+alter table hrsa_tax_declaration add tax_declare_record_id number;
+/
+
+alter table hrsa_tax_declaration add control_view int;
+/
+
+alter table hrsa_salary_acct_emp add income_category varchar2(100);
+/
+
+alter table hrsa_salary_acct_record add control_view int;
+/
+
+update hrsa_salary_acct_record set control_view = 0 where control_view is null;
+/
+
+update hrsa_tax_declaration set control_view = 0 where control_view is null;
+/
+

resource/sqlupgrade/DM/sql202308140203.sql

@@ -0,0 +1,16 @@
+create table hrsa_tax_declaration_value
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  tax_declaration_id number,
+  employee_type number,
+  employee_id number,
+  result_value_json clob
+);
+/
+

resource/sqlupgrade/DM/sql202308150303.sql

@@ -0,0 +1,29 @@
+alter table hrsa_salary_sob_item add income_category varchar2(100);
+/
+
+alter table hrsa_salary_sob_item modify income_category default '1';
+/
+
+update hrsa_salary_sob_item set income_category = '1' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '1');
+/
+
+update hrsa_salary_sob_item set income_category = '2' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '2');
+/
+
+update hrsa_salary_sob_item set income_category = '4' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '4');
+/
+
+alter table hrsa_salary_sob_item add salary_item_code varchar2(100);
+/
+
+update hrsa_salary_sob_item a
+set ( salary_item_code) = (
+    select  code as salary_item_code
+    from hrsa_salary_item b
+    where a.salary_item_id = b.id
+);
+/
+

resource/sqlupgrade/DM/sql202308150503.sql

@@ -0,0 +1,729 @@
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157061, null, null, null, 0, 'all_teams', '1', '2', '当期收入额', 'annualIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157062, null, null, null, 0, 'all_teams', '1', '2', '免税收入', 'annualTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157063, null, null, null, 0, 'all_teams', '1', '2', '其他', 'annualOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157064, null, null, null, 0, 'all_teams', '1', '2', '准予扣除的捐赠额', 'annualDonateTax', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157065, null, null, null, 0, 'all_teams', '1', '2', '减免税额', 'annualTaxSavings', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157066, null, null, null, 0, 'all_teams', '1', '2', '备注', 'annualRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157068, null, null, null, 0, 'all_teams', '1', '4', '当期收入额', 'laborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157069, null, null, null, 0, 'all_teams', '1', '4', '免税收入', 'laborTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157070, null, null, null, 0, 'all_teams', '1', '4', '商业健康保险', 'commercialHealthInsurance4',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157071, null, null, null, 0, 'all_teams', '1', '4', '税延养老保险', 'taxDeferredEndowmentInsurance4',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157072, null, null, null, 0, 'all_teams', '1', '4', '允许扣除税费', 'allowedDeductTax4', 'number',
+        'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157073, null, null, null, 0, 'all_teams', '1', '4', '其他', 'other4', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157074, null, null, null, 0, 'all_teams', '1', '4', '减免税额', 'labor_tax_saving', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157075, null, null, null, 0, 'all_teams', '1', '4', '备注', 'description4', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157077, null, null, null, 0, 'all_teams', '1', '1', '本期收入', 'income', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157078, null, null, null, 0, 'all_teams', '1', '1', '本期免税收入', 'taxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157079, null, null, null, 0, 'all_teams', '1', '1', '基本养老保险费', 'endowmentInsurance', 'number',
+        'jbylaobxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157080, null, null, null, 0, 'all_teams', '1', '1', '基本医疗保险费', 'medicalInsurance', 'number',
+        'jbylbxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157081, null, null, null, 0, 'all_teams', '1', '1', '失业保险费', 'unemploymentInsurance', 'number',
+        'sybxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157082, null, null, null, 0, 'all_teams', '1', '1', '住房公积金', 'housingProvidentFund', 'number',
+        'zfgjj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157083, null, null, null, 0, 'all_teams', '1', '1', '累计子女教育', 'addUpChildEducation', 'number',
+        'ljznjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157084, null, null, null, 0, 'all_teams', '1', '1', '累计住房贷款利息', 'addUpHousingLoanInterest',
+        'number', 'ljzfdklxzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157085, null, null, null, 0, 'all_teams', '1', '1', '累计住房租金', 'addUpHousingRent', 'number',
+        'ljzfzjzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157086, null, null, null, 0, 'all_teams', '1', '1', '累计赡养老人', 'addUpSupportElderly', 'number',
+        'ljsylrzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157087, null, null, null, 0, 'all_teams', '1', '1', '累计继续教育', 'addUpContinuingEducation', 'number',
+        'ljjxjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157088, null, null, null, 0, 'all_teams', '1', '1', '累计3岁以下婴幼儿照护支出', 'addUpInfantCare', 'number',
+        'ljyyezhzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157089, null, null, null, 0, 'all_teams', '1', '1', '企业(职业)年金', 'annuity', 'number', 'nj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157090, null, null, null, 0, 'all_teams', '1', '1', '商业健康保险', 'commercialHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157091, null, null, null, 0, 'all_teams', '1', '1', '税延养老保险', 'taxDeferredEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157092, null, null, null, 0, 'all_teams', '1', '1', '其他', 'other', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157093, null, null, null, 0, 'all_teams', '1', '1', '准予扣除的捐赠额', 'allowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157094, null, null, null, 0, 'all_teams', '1', '1', '减免税额', 'taxDeduction', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157095, null, null, null, 0, 'all_teams', '1', '1', '备注', 'description', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157096, null, null, null, 0, 'all_teams', '1', '107', '一次性补偿收入', 'retireCompensationIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157097, null, null, null, 0, 'all_teams', '1', '107', '本期工资收入', 'retireWageIncome', 'number',
+        'bqgzs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157098, null, null, null, 0, 'all_teams', '1', '107', '免税收入', 'retireTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157099, null, null, null, 0, 'all_teams', '1', '107', '其他', 'retireOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157100, null, null, null, 0, 'all_teams', '1', '107', '准予扣除的捐赠额', 'retireAllowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157101, null, null, null, 0, 'all_teams', '1', '107', '减免税额', 'retireTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157102, null, null, null, 0, 'all_teams', '1', '107', '备注', 'retireRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157103, null, null, null, 0, 'all_teams', '1', '107', '分摊月份数', 'retireSplitMonth', 'number',
+        'ftyfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157104, null, null, null, 0, 'all_teams', '1', '108', '当期收入额', 'dismissIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157105, null, null, null, 0, 'all_teams', '1', '108', '免税收入', 'dismissTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157106, null, null, null, 0, 'all_teams', '1', '108', '其他', 'dismissOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157107, null, null, null, 0, 'all_teams', '1', '108', '备注', 'dismissRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157108, null, null, null, 0, 'all_teams', '1', '108', '准予扣除的捐赠额', 'dismissAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157109, null, null, null, 0, 'all_teams', '1', '108', '减免税额', 'dismissTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157110, null, null, null, 0, 'all_teams', '1', '110', '当期收入额', 'annuityIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157111, null, null, null, 0, 'all_teams', '1', '110', '已完税缴费额', 'annuityTaxPaidAmount', 'number',
+        'ywsjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157112, null, null, null, 0, 'all_teams', '1', '110', '全部缴费额', 'annuityTotalPayment', 'number',
+        'qbjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157113, null, null, null, 0, 'all_teams', '1', '110', '是否一次性领取', 'annuityOneTimeReceive', 'string',
+        'sfycxlq');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157114, null, null, null, 0, 'all_teams', '1', '110', '年金领取方式', 'annuityReceiveMethod', 'string',
+        'njlqfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157115, null, null, null, 0, 'all_teams', '1', '110', '年金领取原因', 'annuityReceiveReason', 'string',
+        'njlqyy');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157116, null, null, null, 0, 'all_teams', '1', '110', '免税收入', 'annuityTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157117, null, null, null, 0, 'all_teams', '1', '110', '减免税额', 'annuityTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157118, null, null, null, 0, 'all_teams', '1', '110', '商业健康保险', 'annuityHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157119, null, null, null, 0, 'all_teams', '1', '110', '税延养老保险', 'annuityEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157120, null, null, null, 0, 'all_teams', '1', '110', '其他', 'annuityOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157121, null, null, null, 0, 'all_teams', '1', '110', '准予扣除的捐赠额', 'annuityAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157122, null, null, null, 0, 'all_teams', '1', '110', '备注', 'annuityRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157123, null, null, null, 0, 'all_teams', '1', '402', '当期收入额', 'insuranceIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157124, null, null, null, 0, 'all_teams', '1', '402', '免税收入', 'insuranceTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157125, null, null, null, 0, 'all_teams', '1', '402', '商业健康保险', 'insuranceHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157126, null, null, null, 0, 'all_teams', '1', '402', '税延养老保险', 'insuranceEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157127, null, null, null, 0, 'all_teams', '1', '402', '其他', 'insuranceOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157128, null, null, null, 0, 'all_teams', '1', '402', '备注', 'insuranceRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157129, null, null, null, 0, 'all_teams', '1', '402', '减免税额', 'insuranceTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157130, null, null, null, 0, 'all_teams', '1', '402', '允许扣除税费', 'insuranceAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157131, null, null, null, 0, 'all_teams', '1', '403', '当期收入额', 'securitiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157132, null, null, null, 0, 'all_teams', '1', '403', '免税收入', 'securitiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157133, null, null, null, 0, 'all_teams', '1', '403', '商业健康保险', 'securitiesHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157134, null, null, null, 0, 'all_teams', '1', '403', '税延养老保险', 'securitiesEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157135, null, null, null, 0, 'all_teams', '1', '403', '其他', 'securitiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157136, null, null, null, 0, 'all_teams', '1', '403', '备注', 'securitiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157137, null, null, null, 0, 'all_teams', '1', '403', '减免税额', 'securitiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157138, null, null, null, 0, 'all_teams', '1', '403', '允许扣除税费', 'securitiesAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157139, null, null, null, 0, 'all_teams', '1', '489', '当期收入额', 'otherContinuousLaborIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157140, null, null, null, 0, 'all_teams', '1', '489', '免税收入', 'otherContinuousLaborTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157141, null, null, null, 0, 'all_teams', '1', '489', '商业健康保险',
+        'otherContinuousLaborHealthInsurance', 'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157142, null, null, null, 0, 'all_teams', '1', '489', '税延养老保险',
+        'otherContinuousLaborEndowmentInsurance', 'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157143, null, null, null, 0, 'all_teams', '1', '489', '其他', 'otherContinuousLaborOther', 'number',
+        'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157144, null, null, null, 0, 'all_teams', '1', '489', '备注', 'otherContinuousLaborRemark', 'string',
+        'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157145, null, null, null, 0, 'all_teams', '1', '489', '减免税额', 'otherContinuousLaborTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157146, null, null, null, 0, 'all_teams', '1', '489', '允许扣除税费',
+        'otherContinuousLaborAllowedDeductTax', 'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157147, null, null, null, 0, 'all_teams', '1', '499', '当期收入额', 'otherLaborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157149, null, null, null, 0, 'all_teams', '1', '499', '免税收入', 'otherLaborTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157150, null, null, null, 0, 'all_teams', '1', '499', '商业健康保险', 'otherLaborHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157151, null, null, null, 0, 'all_teams', '1', '499', '税延养老保险', 'otherLaborEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157152, null, null, null, 0, 'all_teams', '1', '499', '允许扣除税费', 'otherLaborAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157153, null, null, null, 0, 'all_teams', '1', '499', '其他', 'otherLaborOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157154, null, null, null, 0, 'all_teams', '1', '499', '备注', 'otherLaborRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157155, null, null, null, 0, 'all_teams', '1', '499', '减免税额', 'otherLaborTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157156, null, null, null, 0, 'all_teams', '1', '500', '当期收入额', 'authorIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157157, null, null, null, 0, 'all_teams', '1', '500', '免税收入', 'authorTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157158, null, null, null, 0, 'all_teams', '1', '500', '其他', 'authorOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157159, null, null, null, 0, 'all_teams', '1', '500', '减免税额', 'authorTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157160, null, null, null, 0, 'all_teams', '1', '500', '备注', 'authorRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157161, null, null, null, 0, 'all_teams', '1', '600', '当期收入额', 'royaltiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157162, null, null, null, 0, 'all_teams', '1', '600', '免税收入', 'royaltiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157163, null, null, null, 0, 'all_teams', '1', '600', '其他', 'royaltiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157164, null, null, null, 0, 'all_teams', '1', '600', '备注', 'royaltiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157165, null, null, null, 0, 'all_teams', '1', '600', '减免税额', 'royaltiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157166, null, null, null, 0, 'all_teams', '1', '109', '本月股权激励收入', 'stockRightIncome', 'number',
+        'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157167, null, null, null, 0, 'all_teams', '1', '109', '本年累计股权激励收入(不含本月)', 'stockRightAddUpIncome',
+        'number', 'ljsre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157168, null, null, null, 0, 'all_teams', '1', '109', '本年累计其他', 'stockRightOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157169, null, null, null, 0, 'all_teams', '1', '109', '本年累计准予扣除的捐赠额', 'stockRightAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157170, null, null, null, 0, 'all_teams', '1', '109', '本年累计减免税额', 'stockRightTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157171, null, null, null, 0, 'all_teams', '1', '109', '本年累计已扣缴税额', 'stockRightAddUpAdvanceTax',
+        'number', 'ykjse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157172, null, null, null, 0, 'all_teams', '1', '109', '本年累计免税收入', 'stockRightTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157173, null, null, null, 0, 'all_teams', '1', '109', '备注', 'stockRightRemark', 'string', 'bz');
+/
+

resource/sqlupgrade/DM/sql202308150603.sql

@@ -0,0 +1,62 @@
+create table hrsa_sob_add_up_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  salary_item_id number,
+  add_up_column_data_index varchar2(100)
+);
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpIncome', 'addUpSubtraction', 'addUpSocialSecurityTotal', 'addUpAccumulationFundTotal',
+                           'addUpEnterpriseAndOther', 'addUpOtherDeduction', 'addUpTaxExemptIncome',
+                           'addUpAllowedDonation', 'addUpTaxSavings');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpTaxPayable' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpAdvanceTax';
+/
+
+delete from hrsa_sob_add_up_rule
+where income_category = 1
+  and add_up_column_data_index in ('addUpTaxPayable', 'addUpAdvanceTax');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpAdvanceTax' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpTaxPayable';
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpTaxableIncome','addUpTaxFreeIncome','addUpTaxDeduction');
+/
+

resource/sqlupgrade/DM/sql202308170103.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add feedback int;
+/
+

resource/sqlupgrade/DM/sql202308230303.sql

@@ -0,0 +1,6 @@
+alter table hrsa_tax_agent_tax_return  add city_name  varchar2(400);
+/
+
+update  hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416;
+/
+

resource/sqlupgrade/DM/sql202308240201.sql

@@ -0,0 +1,47 @@
+delete from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544827,'智能算薪' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'Intelligent salary calculation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544826,'人员信息报送' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人员信息报送' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'Personnel information submission' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人員信息報送' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/

resource/sqlupgrade/DM/sql202308240302.sql

@@ -0,0 +1,29 @@
+Delete from LeftMenuInfo where id=100191;
+/
+
+Delete from LeftMenuConfig where infoid=100191;
+/
+
+call LMConfig_U_ByInfoInsert (2,100181,1);
+/
+
+call LMInfo_Insert (100191,544827,'','',2,100181,1,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/intelligentCalculateSalarySettings' where id = 100191;
+/
+
+Delete from LeftMenuInfo where id=100192;
+/
+
+Delete from LeftMenuConfig where infoid=100192;
+/
+
+call LMConfig_U_ByInfoInsert (2,100118,7);
+/
+
+call LMInfo_Insert (100192,544826,'','',2,100118,7,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/employeedeclare' where id = 100192;
+/

resource/sqlupgrade/DM/sql202308280203.sql

@@ -0,0 +1,47 @@
+create table hrsa_tax_api_flow_receiver
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  warn_config_id number not null,
+  employee_id number not null,
+  email varchar2(100),
+  mobile varchar2(50)
+);
+/
+
+create table hrsa_tax_api_flow_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number not null,
+  tax_month date not null,
+  use_time date not null,
+  deduct int,
+  employee_id number not null,
+  business_type int not null,
+  result_status int not null
+);
+/
+
+create table hrsa_tax_api_flow_warn_config
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  enable_warn int default 0 not null,
+  threshold int default 0 not null,
+  business_id number default '0' not null
+);
+/
+

resource/sqlupgrade/DM/sql202309040303.sql

@@ -0,0 +1,40 @@
+create table hrsa_add_up_deduction_request
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  request_status number default 1 not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null,
+  tax_agent_id number not null
+);
+/
+
+alter table hrsa_add_up_deduction_request add lock_version int;
+/
+
+alter table hrsa_add_up_deduction_request modify lock_version default 0;
+/
+
+create table hrsa_add_up_deduction_req_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  employee_id number not null,
+  employee_type int not null,
+  tax_agent_id number not null,
+  reason varchar2(255) not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null
+);
+/
+

resource/sqlupgrade/DM/sql202309050203.sql

@@ -0,0 +1,30 @@
+alter table hrsa_add_up_situation add add_up_taxable_income varchar2(255);
+/
+
+alter table hrsa_add_up_situation add actual_add_up_advance_tax varchar2(255);
+/
+
+alter table hrsa_add_up_situation add tax_adjustment varchar2(255);
+/
+
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312885, 1, 674916065864646661, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 5);
+/
+
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312886, 1, 674916065864646658, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 6);
+/
+
+INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1693896072589, '当前累计减免税额合计', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"isCustomFunction":"0","sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{薪资项目.本月（次）减免税额}+{往期累计情况.累计减免税额}', 'salaryItem_taxDeduction+addUpSituation_addUpTaxSavings', 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072606, '本月（次）减免税额', 1693896072589, 'salaryItem_taxDeduction', '{薪资项目.本月（次）减免税额}', 'number', 'salaryItem', 0, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072611, '累计减免税额', 1693896072589, 'addUpSituation_addUpTaxSavings', '{往期累计情况.累计减免税额}', 'number', 'addUpSituation', 1, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+update hrsa_sys_salary_item set value_type = 2 ,formula_id =1693896072589  where id = 674916065864646658;
+/
+
+update  hrsa_salary_item set value_type =2 ,formula_id =1693896072589 where sys_salary_item_id = 674916065864646658;
+/
+

resource/sqlupgrade/DM/sql202312190103.sql

@@ -0,0 +1,61 @@
+ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
+/
+
+update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
+/
+
+update hrsa_tax_report_column set contrast_type = 0;
+/
+

resource/sqlupgrade/DM/sql202312270603.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_tax_declaration_value add (
+	source number
+);
+/
+
+ALTER TABLE hrsa_tax_declare_record add (
+	declare_request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/DM/sql202312270703.sql

@@ -0,0 +1,3 @@
+update  hrsa_tax_declaration_value set source = 0;
+/
+

resource/sqlupgrade/DM/sql202403193303.sql

@@ -0,0 +1,12 @@
+ALTER TABLE hrsa_employee_declare ADD (
+nationality varchar2(255) NULL ,
+birthplace varchar2(255) NULL ,
+tax_reasons varchar2(255) NULL ,
+entry_date date  NULL ,
+departure_date date  NULL
+);
+/
+
+update hrsa_employee_declare set nationality = 'Öйú'  where nationality is  null;
+/
+

resource/sqlupgrade/DM/sql202404120303.sql

@@ -0,0 +1,18 @@
+CREATE TABLE hrsa_tax_declare_status  (
+id NUMBER(38,0) primary key  NOT NULL,
+tax_declare_record_id NUMBER(38,0) NULL ,
+report_type number NULL  ,
+request_id varchar2(100) ,
+tax_declare_type number NULL ,
+tax_declare_status number NULL ,
+display_update_icon number NULL ,
+tax_declare_error_msg varchar2(1000) ,
+person_num number NULL  ,
+tax_pay_amount varchar2(255) ,
+tax_paid_amount varchar2(255) ,
+tax_pure_paid_amount varchar2(255) ,
+declare_request_id varchar2(100) ,
+delete_type number NULL
+);
+/
+

resource/sqlupgrade/DM/sql202406170103.sql

@@ -0,0 +1,14 @@
+CREATE TABLE hrsa_sob_tax_rule  (
+id NUMBER(38,0) primary key  NOT NULL,
+salary_sob_id NUMBER(38,0) NULL ,
+income_category varchar2(100) ,
+tax_index varchar2(100) ,
+salary_item_id NUMBER(38,0) NULL ,
+creator NUMBER(38,0) DEFAULT 0,
+create_time DATE DEFAULT sysdate,
+update_time DATE DEFAULT sysdate,
+delete_type number DEFAULT 0,
+tenant_key varchar2(10) DEFAULT ''
+);
+/
+

resource/sqlupgrade/DM/sql202406260403.sql

@@ -0,0 +1,14 @@
+create table hrsa_api_task_record
+(
+  id number primary key ,
+  source varchar2(500) ,
+  api varchar2(500),
+  param clob ,
+  response clob,
+  create_time date,
+  update_time date,
+  delete_type int default 0,
+  tenant_key varchar2(10)
+);
+/
+

resource/sqlupgrade/DM/sql202407170103.sql

@@ -0,0 +1,14 @@
+create table hrsa_acct_calc_tax_req
+(
+  id number primary key ,
+  create_time date default sysdate,
+  update_time date default sysdate,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_acct_record_id number,
+  tax_agent_id number,
+  request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/DM/sql202412160303.sql

@@ -0,0 +1,122 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+);
+/
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+);
+/
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+);
+/
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+);
+/
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+);
+/
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+);
+/
+

resource/sqlupgrade/DM/sql202412160403.sql

@@ -0,0 +1,18 @@
+alter table hrsa_derate_deduction add employee_type int;
+/
+
+alter table hrsa_endowment_insurance add employee_type int;
+/
+
+alter table hrsa_free_income add employee_type int;
+/
+
+alter table hrsa_grant_donation add employee_type int;
+/
+
+alter table hrsa_health_insurance add employee_type int;
+/
+
+alter table hrsa_other_derate_deduction add employee_type int;
+/
+

resource/sqlupgrade/DM/sql202412230103.sql

@@ -0,0 +1,25 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+);
+/
+

resource/sqlupgrade/DM/sql202412240103.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+);
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+);
+/
+

resource/sqlupgrade/DM/sql2025010801039TEST.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_salary_acct_record ADD (
+	run_status varchar2(200) NULL
+);
+/
+

resource/sqlupgrade/DM/sql202503190103.sql

@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/DM/sql202506190103.sql

@@ -0,0 +1,24 @@
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158200, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '当期收入额', 'dividendsIncome', 'number', 'sre', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158201, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '免税收入', 'dividendsFreeIncome', 'number', 'mssd', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158202, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '准予扣除的捐赠额', 'dividendsAllowedDonation', 'number', 'zykcjze', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158203, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '减免税额', 'dividendsTaxDeduction', 'string', 'jmse', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158204, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '本期收入', 'listedCompanyIncome', 'number', 'sre', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158206, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '免税收入', 'listedCompanyFreeIncome', 'number', 'mssd', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158207, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '准予扣除的捐赠额', 'listedCompanyAllowedDonation', 'number', 'zykcjze', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158208, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '减免税额', 'listedCompanyTaxDeduction', 'string', 'jmse', NULL, 0);
+/
+

resource/sqlupgrade/DM/sql202507010303.sql

@@ -0,0 +1,21 @@
+ALTER TABLE hrsa_free_income ADD  income_category int;
+/
+
+ALTER TABLE hrsa_derate_deduction ADD  income_category int;
+/
+
+ALTER TABLE hrsa_endowment_insurance ADD  income_category int;
+/
+
+ALTER TABLE hrsa_grant_donation ADD  income_category int;
+/
+
+ALTER TABLE hrsa_health_insurance ADD  income_category int;
+/
+
+ALTER TABLE hrsa_other_derate_deduction ADD  income_category int;
+/
+
+ALTER TABLE hrsa_personal_pension ADD  income_category int;
+/
+

resource/sqlupgrade/DM/sql202507010403.sql

@@ -0,0 +1,21 @@
+update  hrsa_free_income set  income_category = 1;
+/
+
+update  hrsa_derate_deduction set  income_category = 1;
+/
+
+update  hrsa_endowment_insurance set  income_category = 1;
+/
+
+update  hrsa_grant_donation set  income_category = 1;
+/
+
+update  hrsa_health_insurance set  income_category = 1;
+/
+
+update  hrsa_other_derate_deduction set  income_category = 1;
+/
+
+update  hrsa_personal_pension set  income_category = 1;
+/
+

resource/sqlupgrade/DM/sql202507110103.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11)  null;
+/
+

resource/sqlupgrade/DM/sql202512250103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_agent add role_id varchar2(200) null;
+/
+

resource/sqlupgrade/DM/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

resource/sqlupgrade/GS/sql202308080603.sql

@@ -0,0 +1,51 @@
+create table hrsa_employee_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  request_id varchar2(100)
+);
+/
+
+create table hrsa_employee_declare
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  employee_id number,
+  employee_type number,
+  employee_name varchar2(100),
+  job_num varchar2(100),
+  card_type number,
+  card_num varchar2(100),
+  gender varchar2(100),
+  birthday date,
+  employment_status number,
+  mobile varchar2(100),
+  employment_type number,
+  employment_first_year varchar2(100),
+  employment_date date,
+  dismiss_date date,
+  disability number,
+  disability_card_no varchar2(100),
+  lonely_old number,
+  martyr_dependents number,
+  martyr_dependents_card_no varchar2(100),
+  deduct_expenses number,
+  successfully_declared number,
+  new_employee_info number,
+  declare_status number,
+  declare_error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/GS/sql202308090303.sql

@@ -0,0 +1,36 @@
+create table hrsa_tax_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  salary_month date,
+  tax_cycle date,
+  remark varchar2(1000),
+  request_id varchar2(100),
+  tax_declare_type number,
+  tax_declare_status number
+);
+/
+
+alter table hrsa_tax_declare_record add display_update_icon number;
+/
+
+alter table hrsa_tax_declare_record add tax_pay_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add person_num int;
+/
+
+alter table hrsa_tax_declare_record add tax_declare_error_msg varchar2(1000);
+/
+
+alter table hrsa_tax_declare_record add tax_paid_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add tax_pure_paid_amount varchar2(255);
+/
+

resource/sqlupgrade/GS/sql202308100803.sql

@@ -0,0 +1,15 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/GS/sql202308110103.sql

@@ -0,0 +1,39 @@
+create table hrsa_tax_report_column
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_report_type varchar2(100),
+  income_category varchar2(100),
+  report_column_name varchar2(100),
+  report_column_data_index varchar2(100)
+);
+/
+
+create table hrsa_sob_tax_report_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  report_column_data_index varchar2(100),
+  salary_item_id number
+);
+/
+
+alter table hrsa_tax_report_column add data_type varchar2(100);
+/
+
+alter table hrsa_tax_report_column add request_param_key varchar2(100);
+/
+
+alter table hrsa_tax_report_column add report_column_label varchar2(100);
+/
+

resource/sqlupgrade/GS/sql202308110203.sql

@@ -0,0 +1,18 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+
+alter table hrsa_tax_declare_fail add income_category varchar2(100);
+/
+

resource/sqlupgrade/GS/sql202308110303.sql

@@ -0,0 +1,18 @@
+alter table hrsa_tax_declaration add tax_declare_record_id number;
+/
+
+alter table hrsa_tax_declaration add control_view int;
+/
+
+alter table hrsa_salary_acct_emp add income_category varchar2(100);
+/
+
+alter table hrsa_salary_acct_record add control_view int;
+/
+
+update hrsa_salary_acct_record set control_view = 0 where control_view is null;
+/
+
+update hrsa_tax_declaration set control_view = 0 where control_view is null;
+/
+

resource/sqlupgrade/GS/sql202308140203.sql

@@ -0,0 +1,16 @@
+create table hrsa_tax_declaration_value
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  tax_declaration_id number,
+  employee_type number,
+  employee_id number,
+  result_value_json clob
+);
+/
+

resource/sqlupgrade/GS/sql202308150303.sql

@@ -0,0 +1,29 @@
+alter table hrsa_salary_sob_item add income_category varchar2(100);
+/
+
+alter table hrsa_salary_sob_item modify income_category default '1';
+/
+
+update hrsa_salary_sob_item set income_category = '1' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '1');
+/
+
+update hrsa_salary_sob_item set income_category = '2' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '2');
+/
+
+update hrsa_salary_sob_item set income_category = '4' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '4');
+/
+
+alter table hrsa_salary_sob_item add salary_item_code varchar2(100);
+/
+
+update hrsa_salary_sob_item a
+set ( salary_item_code) = (
+    select  code as salary_item_code
+    from hrsa_salary_item b
+    where a.salary_item_id = b.id
+);
+/
+

resource/sqlupgrade/GS/sql202308150503.sql

@@ -0,0 +1,729 @@
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157061, null, null, null, 0, 'all_teams', '1', '2', '当期收入额', 'annualIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157062, null, null, null, 0, 'all_teams', '1', '2', '免税收入', 'annualTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157063, null, null, null, 0, 'all_teams', '1', '2', '其他', 'annualOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157064, null, null, null, 0, 'all_teams', '1', '2', '准予扣除的捐赠额', 'annualDonateTax', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157065, null, null, null, 0, 'all_teams', '1', '2', '减免税额', 'annualTaxSavings', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157066, null, null, null, 0, 'all_teams', '1', '2', '备注', 'annualRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157068, null, null, null, 0, 'all_teams', '1', '4', '当期收入额', 'laborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157069, null, null, null, 0, 'all_teams', '1', '4', '免税收入', 'laborTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157070, null, null, null, 0, 'all_teams', '1', '4', '商业健康保险', 'commercialHealthInsurance4',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157071, null, null, null, 0, 'all_teams', '1', '4', '税延养老保险', 'taxDeferredEndowmentInsurance4',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157072, null, null, null, 0, 'all_teams', '1', '4', '允许扣除税费', 'allowedDeductTax4', 'number',
+        'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157073, null, null, null, 0, 'all_teams', '1', '4', '其他', 'other4', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157074, null, null, null, 0, 'all_teams', '1', '4', '减免税额', 'labor_tax_saving', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157075, null, null, null, 0, 'all_teams', '1', '4', '备注', 'description4', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157077, null, null, null, 0, 'all_teams', '1', '1', '本期收入', 'income', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157078, null, null, null, 0, 'all_teams', '1', '1', '本期免税收入', 'taxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157079, null, null, null, 0, 'all_teams', '1', '1', '基本养老保险费', 'endowmentInsurance', 'number',
+        'jbylaobxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157080, null, null, null, 0, 'all_teams', '1', '1', '基本医疗保险费', 'medicalInsurance', 'number',
+        'jbylbxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157081, null, null, null, 0, 'all_teams', '1', '1', '失业保险费', 'unemploymentInsurance', 'number',
+        'sybxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157082, null, null, null, 0, 'all_teams', '1', '1', '住房公积金', 'housingProvidentFund', 'number',
+        'zfgjj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157083, null, null, null, 0, 'all_teams', '1', '1', '累计子女教育', 'addUpChildEducation', 'number',
+        'ljznjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157084, null, null, null, 0, 'all_teams', '1', '1', '累计住房贷款利息', 'addUpHousingLoanInterest',
+        'number', 'ljzfdklxzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157085, null, null, null, 0, 'all_teams', '1', '1', '累计住房租金', 'addUpHousingRent', 'number',
+        'ljzfzjzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157086, null, null, null, 0, 'all_teams', '1', '1', '累计赡养老人', 'addUpSupportElderly', 'number',
+        'ljsylrzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157087, null, null, null, 0, 'all_teams', '1', '1', '累计继续教育', 'addUpContinuingEducation', 'number',
+        'ljjxjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157088, null, null, null, 0, 'all_teams', '1', '1', '累计3岁以下婴幼儿照护支出', 'addUpInfantCare', 'number',
+        'ljyyezhzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157089, null, null, null, 0, 'all_teams', '1', '1', '企业(职业)年金', 'annuity', 'number', 'nj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157090, null, null, null, 0, 'all_teams', '1', '1', '商业健康保险', 'commercialHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157091, null, null, null, 0, 'all_teams', '1', '1', '税延养老保险', 'taxDeferredEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157092, null, null, null, 0, 'all_teams', '1', '1', '其他', 'other', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157093, null, null, null, 0, 'all_teams', '1', '1', '准予扣除的捐赠额', 'allowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157094, null, null, null, 0, 'all_teams', '1', '1', '减免税额', 'taxDeduction', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157095, null, null, null, 0, 'all_teams', '1', '1', '备注', 'description', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157096, null, null, null, 0, 'all_teams', '1', '107', '一次性补偿收入', 'retireCompensationIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157097, null, null, null, 0, 'all_teams', '1', '107', '本期工资收入', 'retireWageIncome', 'number',
+        'bqgzs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157098, null, null, null, 0, 'all_teams', '1', '107', '免税收入', 'retireTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157099, null, null, null, 0, 'all_teams', '1', '107', '其他', 'retireOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157100, null, null, null, 0, 'all_teams', '1', '107', '准予扣除的捐赠额', 'retireAllowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157101, null, null, null, 0, 'all_teams', '1', '107', '减免税额', 'retireTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157102, null, null, null, 0, 'all_teams', '1', '107', '备注', 'retireRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157103, null, null, null, 0, 'all_teams', '1', '107', '分摊月份数', 'retireSplitMonth', 'number',
+        'ftyfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157104, null, null, null, 0, 'all_teams', '1', '108', '当期收入额', 'dismissIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157105, null, null, null, 0, 'all_teams', '1', '108', '免税收入', 'dismissTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157106, null, null, null, 0, 'all_teams', '1', '108', '其他', 'dismissOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157107, null, null, null, 0, 'all_teams', '1', '108', '备注', 'dismissRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157108, null, null, null, 0, 'all_teams', '1', '108', '准予扣除的捐赠额', 'dismissAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157109, null, null, null, 0, 'all_teams', '1', '108', '减免税额', 'dismissTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157110, null, null, null, 0, 'all_teams', '1', '110', '当期收入额', 'annuityIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157111, null, null, null, 0, 'all_teams', '1', '110', '已完税缴费额', 'annuityTaxPaidAmount', 'number',
+        'ywsjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157112, null, null, null, 0, 'all_teams', '1', '110', '全部缴费额', 'annuityTotalPayment', 'number',
+        'qbjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157113, null, null, null, 0, 'all_teams', '1', '110', '是否一次性领取', 'annuityOneTimeReceive', 'string',
+        'sfycxlq');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157114, null, null, null, 0, 'all_teams', '1', '110', '年金领取方式', 'annuityReceiveMethod', 'string',
+        'njlqfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157115, null, null, null, 0, 'all_teams', '1', '110', '年金领取原因', 'annuityReceiveReason', 'string',
+        'njlqyy');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157116, null, null, null, 0, 'all_teams', '1', '110', '免税收入', 'annuityTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157117, null, null, null, 0, 'all_teams', '1', '110', '减免税额', 'annuityTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157118, null, null, null, 0, 'all_teams', '1', '110', '商业健康保险', 'annuityHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157119, null, null, null, 0, 'all_teams', '1', '110', '税延养老保险', 'annuityEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157120, null, null, null, 0, 'all_teams', '1', '110', '其他', 'annuityOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157121, null, null, null, 0, 'all_teams', '1', '110', '准予扣除的捐赠额', 'annuityAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157122, null, null, null, 0, 'all_teams', '1', '110', '备注', 'annuityRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157123, null, null, null, 0, 'all_teams', '1', '402', '当期收入额', 'insuranceIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157124, null, null, null, 0, 'all_teams', '1', '402', '免税收入', 'insuranceTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157125, null, null, null, 0, 'all_teams', '1', '402', '商业健康保险', 'insuranceHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157126, null, null, null, 0, 'all_teams', '1', '402', '税延养老保险', 'insuranceEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157127, null, null, null, 0, 'all_teams', '1', '402', '其他', 'insuranceOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157128, null, null, null, 0, 'all_teams', '1', '402', '备注', 'insuranceRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157129, null, null, null, 0, 'all_teams', '1', '402', '减免税额', 'insuranceTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157130, null, null, null, 0, 'all_teams', '1', '402', '允许扣除税费', 'insuranceAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157131, null, null, null, 0, 'all_teams', '1', '403', '当期收入额', 'securitiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157132, null, null, null, 0, 'all_teams', '1', '403', '免税收入', 'securitiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157133, null, null, null, 0, 'all_teams', '1', '403', '商业健康保险', 'securitiesHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157134, null, null, null, 0, 'all_teams', '1', '403', '税延养老保险', 'securitiesEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157135, null, null, null, 0, 'all_teams', '1', '403', '其他', 'securitiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157136, null, null, null, 0, 'all_teams', '1', '403', '备注', 'securitiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157137, null, null, null, 0, 'all_teams', '1', '403', '减免税额', 'securitiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157138, null, null, null, 0, 'all_teams', '1', '403', '允许扣除税费', 'securitiesAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157139, null, null, null, 0, 'all_teams', '1', '489', '当期收入额', 'otherContinuousLaborIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157140, null, null, null, 0, 'all_teams', '1', '489', '免税收入', 'otherContinuousLaborTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157141, null, null, null, 0, 'all_teams', '1', '489', '商业健康保险',
+        'otherContinuousLaborHealthInsurance', 'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157142, null, null, null, 0, 'all_teams', '1', '489', '税延养老保险',
+        'otherContinuousLaborEndowmentInsurance', 'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157143, null, null, null, 0, 'all_teams', '1', '489', '其他', 'otherContinuousLaborOther', 'number',
+        'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157144, null, null, null, 0, 'all_teams', '1', '489', '备注', 'otherContinuousLaborRemark', 'string',
+        'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157145, null, null, null, 0, 'all_teams', '1', '489', '减免税额', 'otherContinuousLaborTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157146, null, null, null, 0, 'all_teams', '1', '489', '允许扣除税费',
+        'otherContinuousLaborAllowedDeductTax', 'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157147, null, null, null, 0, 'all_teams', '1', '499', '当期收入额', 'otherLaborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157149, null, null, null, 0, 'all_teams', '1', '499', '免税收入', 'otherLaborTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157150, null, null, null, 0, 'all_teams', '1', '499', '商业健康保险', 'otherLaborHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157151, null, null, null, 0, 'all_teams', '1', '499', '税延养老保险', 'otherLaborEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157152, null, null, null, 0, 'all_teams', '1', '499', '允许扣除税费', 'otherLaborAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157153, null, null, null, 0, 'all_teams', '1', '499', '其他', 'otherLaborOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157154, null, null, null, 0, 'all_teams', '1', '499', '备注', 'otherLaborRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157155, null, null, null, 0, 'all_teams', '1', '499', '减免税额', 'otherLaborTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157156, null, null, null, 0, 'all_teams', '1', '500', '当期收入额', 'authorIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157157, null, null, null, 0, 'all_teams', '1', '500', '免税收入', 'authorTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157158, null, null, null, 0, 'all_teams', '1', '500', '其他', 'authorOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157159, null, null, null, 0, 'all_teams', '1', '500', '减免税额', 'authorTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157160, null, null, null, 0, 'all_teams', '1', '500', '备注', 'authorRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157161, null, null, null, 0, 'all_teams', '1', '600', '当期收入额', 'royaltiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157162, null, null, null, 0, 'all_teams', '1', '600', '免税收入', 'royaltiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157163, null, null, null, 0, 'all_teams', '1', '600', '其他', 'royaltiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157164, null, null, null, 0, 'all_teams', '1', '600', '备注', 'royaltiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157165, null, null, null, 0, 'all_teams', '1', '600', '减免税额', 'royaltiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157166, null, null, null, 0, 'all_teams', '1', '109', '本月股权激励收入', 'stockRightIncome', 'number',
+        'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157167, null, null, null, 0, 'all_teams', '1', '109', '本年累计股权激励收入(不含本月)', 'stockRightAddUpIncome',
+        'number', 'ljsre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157168, null, null, null, 0, 'all_teams', '1', '109', '本年累计其他', 'stockRightOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157169, null, null, null, 0, 'all_teams', '1', '109', '本年累计准予扣除的捐赠额', 'stockRightAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157170, null, null, null, 0, 'all_teams', '1', '109', '本年累计减免税额', 'stockRightTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157171, null, null, null, 0, 'all_teams', '1', '109', '本年累计已扣缴税额', 'stockRightAddUpAdvanceTax',
+        'number', 'ykjse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157172, null, null, null, 0, 'all_teams', '1', '109', '本年累计免税收入', 'stockRightTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157173, null, null, null, 0, 'all_teams', '1', '109', '备注', 'stockRightRemark', 'string', 'bz');
+/
+

resource/sqlupgrade/GS/sql202308150603.sql

@@ -0,0 +1,62 @@
+create table hrsa_sob_add_up_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  salary_item_id number,
+  add_up_column_data_index varchar2(100)
+);
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpIncome', 'addUpSubtraction', 'addUpSocialSecurityTotal', 'addUpAccumulationFundTotal',
+                           'addUpEnterpriseAndOther', 'addUpOtherDeduction', 'addUpTaxExemptIncome',
+                           'addUpAllowedDonation', 'addUpTaxSavings');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpTaxPayable' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpAdvanceTax';
+/
+
+delete from hrsa_sob_add_up_rule
+where income_category = 1
+  and add_up_column_data_index in ('addUpTaxPayable', 'addUpAdvanceTax');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpAdvanceTax' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpTaxPayable';
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpTaxableIncome','addUpTaxFreeIncome','addUpTaxDeduction');
+/
+

resource/sqlupgrade/GS/sql202308170103.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add feedback int;
+/
+

resource/sqlupgrade/GS/sql202308230303.sql

@@ -0,0 +1,6 @@
+alter table hrsa_tax_agent_tax_return  add city_name  varchar2(400);
+/
+
+update  hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416;
+/
+

resource/sqlupgrade/GS/sql202308240201.sql

@@ -0,0 +1,47 @@
+delete from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544827,'智能算薪' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'Intelligent salary calculation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544826,'人员信息报送' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人员信息报送' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'Personnel information submission' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人員信息報送' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/

resource/sqlupgrade/GS/sql202308240302.sql

@@ -0,0 +1,29 @@
+Delete from LeftMenuInfo where id=100191;
+/
+
+Delete from LeftMenuConfig where infoid=100191;
+/
+
+call LMConfig_U_ByInfoInsert (2,100181,1);
+/
+
+call LMInfo_Insert (100191,544827,'','',2,100181,1,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/intelligentCalculateSalarySettings' where id = 100191;
+/
+
+Delete from LeftMenuInfo where id=100192;
+/
+
+Delete from LeftMenuConfig where infoid=100192;
+/
+
+call LMConfig_U_ByInfoInsert (2,100118,7);
+/
+
+call LMInfo_Insert (100192,544826,'','',2,100118,7,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/employeedeclare' where id = 100192;
+/

resource/sqlupgrade/GS/sql202308280203.sql

@@ -0,0 +1,47 @@
+create table hrsa_tax_api_flow_receiver
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  warn_config_id number not null,
+  employee_id number not null,
+  email varchar2(100),
+  mobile varchar2(50)
+);
+/
+
+create table hrsa_tax_api_flow_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number not null,
+  tax_month date not null,
+  use_time date not null,
+  deduct int,
+  employee_id number not null,
+  business_type int not null,
+  result_status int not null
+);
+/
+
+create table hrsa_tax_api_flow_warn_config
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  enable_warn int default 0 not null,
+  threshold int default 0 not null,
+  business_id number default '0' not null
+);
+/
+

resource/sqlupgrade/GS/sql202309040303.sql

@@ -0,0 +1,40 @@
+create table hrsa_add_up_deduction_request
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  request_status number default 1 not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null,
+  tax_agent_id number not null
+);
+/
+
+alter table hrsa_add_up_deduction_request add lock_version int;
+/
+
+alter table hrsa_add_up_deduction_request modify lock_version default 0;
+/
+
+create table hrsa_add_up_deduction_req_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  employee_id number not null,
+  employee_type int not null,
+  tax_agent_id number not null,
+  reason varchar2(255) not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null
+);
+/
+

resource/sqlupgrade/GS/sql202309050203.sql

@@ -0,0 +1,30 @@
+alter table hrsa_add_up_situation add add_up_taxable_income varchar2(255);
+/
+
+alter table hrsa_add_up_situation add actual_add_up_advance_tax varchar2(255);
+/
+
+alter table hrsa_add_up_situation add tax_adjustment varchar2(255);
+/
+
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312885, 1, 674916065864646661, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 5);
+/
+
+INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312886, 1, 674916065864646658, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 6);
+/
+
+INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1693896072589, '当前累计减免税额合计', '备注', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"isCustomFunction":"0","sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{薪资项目.本月（次）减免税额}+{往期累计情况.累计减免税额}', 'salaryItem_taxDeduction+addUpSituation_addUpTaxSavings', 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072606, '本月（次）减免税额', 1693896072589, 'salaryItem_taxDeduction', '{薪资项目.本月（次）减免税额}', 'number', 'salaryItem', 0, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1693896072611, '累计减免税额', 1693896072589, 'addUpSituation_addUpTaxSavings', '{往期累计情况.累计减免税额}', 'number', 'addUpSituation', 1, 27, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'));
+/
+
+update hrsa_sys_salary_item set value_type = 2 ,formula_id =1693896072589  where id = 674916065864646658;
+/
+
+update  hrsa_salary_item set value_type =2 ,formula_id =1693896072589 where sys_salary_item_id = 674916065864646658;
+/
+

resource/sqlupgrade/GS/sql202312190103.sql

@@ -0,0 +1,61 @@
+ALTER TABLE hrsa_tax_report_column ADD contrast_type int NULL;
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158174, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计收入额', 'addUpIncome', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158175, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计免税收入', 'addUpTaxFreeIncome', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158176, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减除费用', 'addUpSubtraction', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158177, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计专项扣除', 'addUpSpecialDeduction', 'number', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158184, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计其他扣除', 'addUpOtherDeduction', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158185, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计准予扣除的捐赠', 'addUpAllowedDonation', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158186, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税所得额', 'addUpTaxableIncome', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158187, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '税率', 'taxRate', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158188, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '速算扣除数', 'quickDeductionFactor', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158189, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计应纳税额', 'addUpTaxPayable', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158190, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计减免税额', 'addUpTaxDeduction', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158192, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '累计已缴税额', 'addUpAdvanceTax', '', NULL, NULL,1);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label,contrast_type) VALUES
+(805915446042158193, NULL, NULL, NULL, 0, 'all_teams', '1', '1', '应补(退)税额', 'refundedOrSupplementedTax', '', NULL, NULL,1);
+/
+
+update hrsa_tax_report_column set report_column_name = '累计3岁以下婴幼儿照护' where report_column_name = '累计3岁以下婴幼儿照护支出';
+/
+
+update hrsa_tax_report_column set contrast_type = 0;
+/
+

resource/sqlupgrade/GS/sql202312270603.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_tax_declaration_value add (
+	source number
+);
+/
+
+ALTER TABLE hrsa_tax_declare_record add (
+	declare_request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/GS/sql202312270703.sql

@@ -0,0 +1,3 @@
+update  hrsa_tax_declaration_value set source = 0;
+/
+

resource/sqlupgrade/GS/sql202403193303.sql

@@ -0,0 +1,12 @@
+ALTER TABLE hrsa_employee_declare ADD (
+nationality varchar2(255) NULL ,
+birthplace varchar2(255) NULL ,
+tax_reasons varchar2(255) NULL ,
+entry_date date  NULL ,
+departure_date date  NULL
+);
+/
+
+update hrsa_employee_declare set nationality = 'Öйú'  where nationality is  null;
+/
+

resource/sqlupgrade/GS/sql202404120303.sql

@@ -0,0 +1,18 @@
+CREATE TABLE hrsa_tax_declare_status  (
+id NUMBER(38,0) primary key  NOT NULL,
+tax_declare_record_id NUMBER(38,0) NULL ,
+report_type number NULL  ,
+request_id varchar2(100) ,
+tax_declare_type number NULL ,
+tax_declare_status number NULL ,
+display_update_icon number NULL ,
+tax_declare_error_msg varchar2(1000) ,
+person_num number NULL  ,
+tax_pay_amount varchar2(255) ,
+tax_paid_amount varchar2(255) ,
+tax_pure_paid_amount varchar2(255) ,
+declare_request_id varchar2(100) ,
+delete_type number NULL
+);
+/
+

resource/sqlupgrade/GS/sql202406170103.sql

@@ -0,0 +1,14 @@
+CREATE TABLE hrsa_sob_tax_rule  (
+id NUMBER(38,0) primary key  NOT NULL,
+salary_sob_id NUMBER(38,0) NULL ,
+income_category varchar2(100) ,
+tax_index varchar2(100) ,
+salary_item_id NUMBER(38,0) NULL ,
+creator NUMBER(38,0) DEFAULT 0,
+create_time DATE DEFAULT sysdate,
+update_time DATE DEFAULT sysdate,
+delete_type number DEFAULT 0,
+tenant_key varchar2(10) DEFAULT ''
+);
+/
+

resource/sqlupgrade/GS/sql202406260403.sql

@@ -0,0 +1,14 @@
+create table hrsa_api_task_record
+(
+  id number primary key ,
+  source varchar2(500) ,
+  api varchar2(500),
+  param clob ,
+  response clob,
+  create_time date,
+  update_time date,
+  delete_type int default 0,
+  tenant_key varchar2(10)
+);
+/
+

resource/sqlupgrade/GS/sql202407170103.sql

@@ -0,0 +1,14 @@
+create table hrsa_acct_calc_tax_req
+(
+  id number primary key ,
+  create_time date default sysdate,
+  update_time date default sysdate,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_acct_record_id number,
+  tax_agent_id number,
+  request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/GS/sql202412160303.sql

@@ -0,0 +1,122 @@
+create table hrsa_other_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  other_deduction varchar2(50),
+  remark varchar2(255)
+);
+/
+
+create table hrsa_health_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  identification_number varchar2(255),
+  effective_date date,
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50)
+);
+/
+
+create table hrsa_grant_donation
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  recipient_name varchar2(255),
+  tax_code varchar2(255),
+  donation_number varchar2(255),
+  donate_date date,
+  donate_amount varchar2(50),
+  deduction_proportion varchar2(10),
+  actual_deduction varchar2(50)
+);
+/
+
+create table hrsa_endowment_insurance
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  account_number varchar2(255),
+  check_code varchar2(255),
+  year_premium varchar2(50),
+  month_premium varchar2(50),
+  current_deduction varchar2(50),
+  deduction_month date
+);
+/
+
+create table hrsa_derate_deduction
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  derate_item varchar2(255),
+  derate_property varchar2(255),
+  derate_amount varchar2(255)
+);
+/
+
+create table hrsa_free_income
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  free_item varchar2(255),
+  free_property varchar2(255),
+  free_amount varchar2(255)
+);
+/
+

resource/sqlupgrade/GS/sql202412160403.sql

@@ -0,0 +1,18 @@
+alter table hrsa_derate_deduction add employee_type int;
+/
+
+alter table hrsa_endowment_insurance add employee_type int;
+/
+
+alter table hrsa_free_income add employee_type int;
+/
+
+alter table hrsa_grant_donation add employee_type int;
+/
+
+alter table hrsa_health_insurance add employee_type int;
+/
+
+alter table hrsa_other_derate_deduction add employee_type int;
+/
+

resource/sqlupgrade/GS/sql202412230103.sql

@@ -0,0 +1,25 @@
+create table hrsa_personal_pension
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  main_id number,
+  tax_year_month date,
+  employee_id number,
+  tax_agent_id number,
+  file_status int,
+  voucher_type varchar2(255),
+  voucher_no varchar2(255),
+  pay_amount varchar2(255),
+  data_source int,
+  collect_source varchar2(50),
+  pay_month date,
+  eb_data_id number,
+  voucher_type_name varchar2(50),
+  employee_type int
+);
+/
+

resource/sqlupgrade/GS/sql202412240103.sql

@@ -0,0 +1,10 @@
+ALTER TABLE hrsa_other_deduction ADD (
+	free_income varchar2(255) NULL
+);
+/
+
+ALTER TABLE hrsa_other_deduction ADD (
+	derate_deduction varchar2(255) NULL
+);
+/
+

resource/sqlupgrade/GS/sql2025010801039TEST.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hrsa_salary_acct_record ADD (
+	run_status varchar2(200) NULL
+);
+/
+

resource/sqlupgrade/GS/sql202503190103.sql

@@ -0,0 +1,38 @@
+create table hrsa_deduction_amount
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    employee_id number,
+    employee_type number,
+    employee_name varchar2(100),
+    job_num varchar2(100),
+    card_type number,
+    card_num varchar2(100),
+    nationality varchar2(200),
+    deduct_flag number,
+    successfully_declared number,
+    declare_status number,
+    declare_error_msg varchar2(1000)
+);
+/
+
+create table hrsa_deduction_amount_record
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int,
+    tenant_key varchar2(10),
+    tax_agent_id number,
+    year varchar2(100),
+    request_id varchar2(100)
+);
+/
+

resource/sqlupgrade/GS/sql202506190103.sql

@@ -0,0 +1,24 @@
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158200, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '当期收入额', 'dividendsIncome', 'number', 'sre', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158201, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '免税收入', 'dividendsFreeIncome', 'number', 'mssd', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158202, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '准予扣除的捐赠额', 'dividendsAllowedDonation', 'number', 'zykcjze', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158203, NULL, NULL, NULL, 0, 'all_teams', '1', '800', '减免税额', 'dividendsTaxDeduction', 'string', 'jmse', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158204, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '本期收入', 'listedCompanyIncome', 'number', 'sre', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158206, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '免税收入', 'listedCompanyFreeIncome', 'number', 'mssd', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158207, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '准予扣除的捐赠额', 'listedCompanyAllowedDonation', 'number', 'zykcjze', NULL, 0);
+/
+
+INSERT INTO hrsa_tax_report_column(id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type, income_category, report_column_name, report_column_data_index, data_type, request_param_key, report_column_label, contrast_type) VALUES (805915446042158208, NULL, NULL, NULL, 0, 'all_teams', '1', '810', '减免税额', 'listedCompanyTaxDeduction', 'string', 'jmse', NULL, 0);
+/
+

resource/sqlupgrade/GS/sql202507010303.sql

@@ -0,0 +1,21 @@
+ALTER TABLE hrsa_free_income ADD  income_category int;
+/
+
+ALTER TABLE hrsa_derate_deduction ADD  income_category int;
+/
+
+ALTER TABLE hrsa_endowment_insurance ADD  income_category int;
+/
+
+ALTER TABLE hrsa_grant_donation ADD  income_category int;
+/
+
+ALTER TABLE hrsa_health_insurance ADD  income_category int;
+/
+
+ALTER TABLE hrsa_other_derate_deduction ADD  income_category int;
+/
+
+ALTER TABLE hrsa_personal_pension ADD  income_category int;
+/
+

resource/sqlupgrade/GS/sql202507010403.sql

@@ -0,0 +1,21 @@
+update  hrsa_free_income set  income_category = 1;
+/
+
+update  hrsa_derate_deduction set  income_category = 1;
+/
+
+update  hrsa_endowment_insurance set  income_category = 1;
+/
+
+update  hrsa_grant_donation set  income_category = 1;
+/
+
+update  hrsa_health_insurance set  income_category = 1;
+/
+
+update  hrsa_other_derate_deduction set  income_category = 1;
+/
+
+update  hrsa_personal_pension set  income_category = 1;
+/
+

resource/sqlupgrade/GS/sql202507110103.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add report_type number(11)  null;
+/
+

resource/sqlupgrade/GS/sql202512250103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_agent add role_id varchar2(200) null;
+/
+

resource/sqlupgrade/GS/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

resource/sqlupgrade/JC/sql202307180103.sql

@@ -0,0 +1,34 @@
+create table hrsa_tax_declare_api_profile
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  api_profile int
+);
+/
+
+create index id_tenant_key_22b215db on hrsa_tax_declare_api_profile(tenant_key);
+/
+
+create table hrsa_tax_payment_request
+(
+    id number primary key ,
+    create_time date,
+    update_time date,
+    creator number,
+    delete_type int default 0,
+    tenant_key varchar2(10),
+    tax_agent_id number not null,
+    tax_declare_record_id number,
+    tax_year_month date not null,
+    request_id varchar2(50) not null,
+    request_type int not null
+);
+/
+
+create index id_tenant_key_bcb610c7 on hrsa_tax_payment_request(tenant_key);
+/
+

resource/sqlupgrade/JC/sql202307180203.sql

@@ -0,0 +1,38 @@
+create table hrsa_tax_declare_api_config
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  host varchar2(255),
+  app_key varchar2(255),
+  app_secret varchar2(255)
+);
+/
+
+create unique index idx_tenant_key_api_a6f21b46 on hrsa_tax_declare_api_config(tenant_key);
+/
+
+alter table hrsa_tax_declare_api_config modify host not null;
+/
+
+alter table hrsa_tax_declare_api_config modify app_key not null;
+/
+
+alter table hrsa_tax_declare_api_config modify app_secret not null;
+/
+
+alter table hrsa_tax_declare_api_config add enable_use int;
+/
+
+alter table hrsa_tax_declare_api_config add totality number;
+/
+
+alter table hrsa_tax_declare_api_config add remain number;
+/
+
+alter table hrsa_tax_declare_api_config add last_update_time date;
+/
+

resource/sqlupgrade/JC/sql202307180403.sql

@@ -0,0 +1,31 @@
+create table hrsa_tax_agent_tax_return
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number not null,
+  tax_code varchar2(50) not null,
+  tax_registration_number varchar2(50) ,
+  department_code varchar2(50),
+  department_name varchar2(50),
+  nation varchar2(50),
+  province varchar2(50),
+  city varchar2(50),
+  area_code varchar2(50) not null,
+  password_type int not null,
+  real_account varchar2(50) ,
+  pwd varchar2(50) not null,
+  check_status int not null,
+  fail_reason varchar2(255)
+);
+/
+
+create index id_tenant_key_tax_return on hrsa_tax_agent_tax_return(tenant_key);
+/
+
+create unique index id_tax_agent_id_tax_return on hrsa_tax_agent_tax_return(tax_agent_id);
+/
+

resource/sqlupgrade/JC/sql202308080603.sql

@@ -0,0 +1,51 @@
+create table hrsa_employee_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  request_id varchar2(100)
+);
+/
+
+create table hrsa_employee_declare
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  tax_cycle date,
+  employee_id number,
+  employee_type number,
+  employee_name varchar2(100),
+  job_num varchar2(100),
+  card_type number,
+  card_num varchar2(100),
+  gender varchar2(100),
+  birthday date,
+  employment_status number,
+  mobile varchar2(100),
+  employment_type number,
+  employment_first_year varchar2(100),
+  employment_date date,
+  dismiss_date date,
+  disability number,
+  disability_card_no varchar2(100),
+  lonely_old number,
+  martyr_dependents number,
+  martyr_dependents_card_no varchar2(100),
+  deduct_expenses number,
+  successfully_declared number,
+  new_employee_info number,
+  declare_status number,
+  declare_error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/JC/sql202308090303.sql

@@ -0,0 +1,36 @@
+create table hrsa_tax_declare_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number,
+  salary_month date,
+  tax_cycle date,
+  remark varchar2(1000),
+  request_id varchar2(100),
+  tax_declare_type number,
+  tax_declare_status number
+);
+/
+
+alter table hrsa_tax_declare_record add display_update_icon number;
+/
+
+alter table hrsa_tax_declare_record add tax_pay_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add person_num int;
+/
+
+alter table hrsa_tax_declare_record add tax_declare_error_msg varchar2(1000);
+/
+
+alter table hrsa_tax_declare_record add tax_paid_amount varchar2(255);
+/
+
+alter table hrsa_tax_declare_record add tax_pure_paid_amount varchar2(255);
+/
+

resource/sqlupgrade/JC/sql202308100803.sql

@@ -0,0 +1,15 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+

resource/sqlupgrade/JC/sql202308110103.sql

@@ -0,0 +1,39 @@
+create table hrsa_tax_report_column
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_report_type varchar2(100),
+  income_category varchar2(100),
+  report_column_name varchar2(100),
+  report_column_data_index varchar2(100)
+);
+/
+
+create table hrsa_sob_tax_report_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  report_column_data_index varchar2(100),
+  salary_item_id number
+);
+/
+
+alter table hrsa_tax_report_column add data_type varchar2(100);
+/
+
+alter table hrsa_tax_report_column add request_param_key varchar2(100);
+/
+
+alter table hrsa_tax_report_column add report_column_label varchar2(100);
+/
+

resource/sqlupgrade/JC/sql202308110203.sql

@@ -0,0 +1,18 @@
+create table hrsa_tax_declare_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  employee_name varchar2(100),
+  card_num varchar2(100),
+  error_msg varchar2(1000)
+);
+/
+
+alter table hrsa_tax_declare_fail add income_category varchar2(100);
+/
+

resource/sqlupgrade/JC/sql202308110303.sql

@@ -0,0 +1,18 @@
+alter table hrsa_tax_declaration add tax_declare_record_id number;
+/
+
+alter table hrsa_tax_declaration add control_view int;
+/
+
+alter table hrsa_salary_acct_emp add income_category varchar2(100);
+/
+
+alter table hrsa_salary_acct_record add control_view int;
+/
+
+update hrsa_salary_acct_record set control_view = 0 where control_view is null;
+/
+
+update hrsa_tax_declaration set control_view = 0 where control_view is null;
+/
+

resource/sqlupgrade/JC/sql202308140203.sql

@@ -0,0 +1,16 @@
+create table hrsa_tax_declaration_value
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_declare_record_id number,
+  tax_declaration_id number,
+  employee_type number,
+  employee_id number,
+  result_value_json clob
+);
+/
+

resource/sqlupgrade/JC/sql202308150303.sql

@@ -0,0 +1,29 @@
+alter table hrsa_salary_sob_item add income_category varchar2(100);
+/
+
+alter table hrsa_salary_sob_item modify income_category default '1';
+/
+
+update hrsa_salary_sob_item set income_category = '1' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '1');
+/
+
+update hrsa_salary_sob_item set income_category = '2' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '2');
+/
+
+update hrsa_salary_sob_item set income_category = '4' where salary_sob_id IN
+(select id from hrsa_salary_sob where hrsa_salary_sob.income_category = '4');
+/
+
+alter table hrsa_salary_sob_item add salary_item_code varchar2(100);
+/
+
+update hrsa_salary_sob_item a
+set ( salary_item_code) = (
+    select  code as salary_item_code
+    from hrsa_salary_item b
+    where a.salary_item_id = b.id
+);
+/
+

resource/sqlupgrade/JC/sql202308150503.sql

@@ -0,0 +1,729 @@
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157061, null, null, null, 0, 'all_teams', '1', '2', '当期收入额', 'annualIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157062, null, null, null, 0, 'all_teams', '1', '2', '免税收入', 'annualTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157063, null, null, null, 0, 'all_teams', '1', '2', '其他', 'annualOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157064, null, null, null, 0, 'all_teams', '1', '2', '准予扣除的捐赠额', 'annualDonateTax', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157065, null, null, null, 0, 'all_teams', '1', '2', '减免税额', 'annualTaxSavings', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157066, null, null, null, 0, 'all_teams', '1', '2', '备注', 'annualRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157068, null, null, null, 0, 'all_teams', '1', '4', '当期收入额', 'laborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157069, null, null, null, 0, 'all_teams', '1', '4', '免税收入', 'laborTaxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157070, null, null, null, 0, 'all_teams', '1', '4', '商业健康保险', 'commercialHealthInsurance4',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157071, null, null, null, 0, 'all_teams', '1', '4', '税延养老保险', 'taxDeferredEndowmentInsurance4',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157072, null, null, null, 0, 'all_teams', '1', '4', '允许扣除税费', 'allowedDeductTax4', 'number',
+        'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157073, null, null, null, 0, 'all_teams', '1', '4', '其他', 'other4', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157074, null, null, null, 0, 'all_teams', '1', '4', '减免税额', 'labor_tax_saving', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157075, null, null, null, 0, 'all_teams', '1', '4', '备注', 'description4', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157077, null, null, null, 0, 'all_teams', '1', '1', '本期收入', 'income', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157078, null, null, null, 0, 'all_teams', '1', '1', '本期免税收入', 'taxFreeIncome', 'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157079, null, null, null, 0, 'all_teams', '1', '1', '基本养老保险费', 'endowmentInsurance', 'number',
+        'jbylaobxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157080, null, null, null, 0, 'all_teams', '1', '1', '基本医疗保险费', 'medicalInsurance', 'number',
+        'jbylbxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157081, null, null, null, 0, 'all_teams', '1', '1', '失业保险费', 'unemploymentInsurance', 'number',
+        'sybxf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157082, null, null, null, 0, 'all_teams', '1', '1', '住房公积金', 'housingProvidentFund', 'number',
+        'zfgjj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157083, null, null, null, 0, 'all_teams', '1', '1', '累计子女教育', 'addUpChildEducation', 'number',
+        'ljznjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157084, null, null, null, 0, 'all_teams', '1', '1', '累计住房贷款利息', 'addUpHousingLoanInterest',
+        'number', 'ljzfdklxzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157085, null, null, null, 0, 'all_teams', '1', '1', '累计住房租金', 'addUpHousingRent', 'number',
+        'ljzfzjzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157086, null, null, null, 0, 'all_teams', '1', '1', '累计赡养老人', 'addUpSupportElderly', 'number',
+        'ljsylrzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157087, null, null, null, 0, 'all_teams', '1', '1', '累计继续教育', 'addUpContinuingEducation', 'number',
+        'ljjxjyzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157088, null, null, null, 0, 'all_teams', '1', '1', '累计3岁以下婴幼儿照护支出', 'addUpInfantCare', 'number',
+        'ljyyezhzc');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157089, null, null, null, 0, 'all_teams', '1', '1', '企业(职业)年金', 'annuity', 'number', 'nj');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157090, null, null, null, 0, 'all_teams', '1', '1', '商业健康保险', 'commercialHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157091, null, null, null, 0, 'all_teams', '1', '1', '税延养老保险', 'taxDeferredEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157092, null, null, null, 0, 'all_teams', '1', '1', '其他', 'other', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157093, null, null, null, 0, 'all_teams', '1', '1', '准予扣除的捐赠额', 'allowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157094, null, null, null, 0, 'all_teams', '1', '1', '减免税额', 'taxDeduction', 'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157095, null, null, null, 0, 'all_teams', '1', '1', '备注', 'description', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157096, null, null, null, 0, 'all_teams', '1', '107', '一次性补偿收入', 'retireCompensationIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157097, null, null, null, 0, 'all_teams', '1', '107', '本期工资收入', 'retireWageIncome', 'number',
+        'bqgzs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157098, null, null, null, 0, 'all_teams', '1', '107', '免税收入', 'retireTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157099, null, null, null, 0, 'all_teams', '1', '107', '其他', 'retireOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157100, null, null, null, 0, 'all_teams', '1', '107', '准予扣除的捐赠额', 'retireAllowedDonation', 'number',
+        'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157101, null, null, null, 0, 'all_teams', '1', '107', '减免税额', 'retireTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157102, null, null, null, 0, 'all_teams', '1', '107', '备注', 'retireRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157103, null, null, null, 0, 'all_teams', '1', '107', '分摊月份数', 'retireSplitMonth', 'number',
+        'ftyfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157104, null, null, null, 0, 'all_teams', '1', '108', '当期收入额', 'dismissIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157105, null, null, null, 0, 'all_teams', '1', '108', '免税收入', 'dismissTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157106, null, null, null, 0, 'all_teams', '1', '108', '其他', 'dismissOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157107, null, null, null, 0, 'all_teams', '1', '108', '备注', 'dismissRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157108, null, null, null, 0, 'all_teams', '1', '108', '准予扣除的捐赠额', 'dismissAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157109, null, null, null, 0, 'all_teams', '1', '108', '减免税额', 'dismissTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157110, null, null, null, 0, 'all_teams', '1', '110', '当期收入额', 'annuityIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157111, null, null, null, 0, 'all_teams', '1', '110', '已完税缴费额', 'annuityTaxPaidAmount', 'number',
+        'ywsjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157112, null, null, null, 0, 'all_teams', '1', '110', '全部缴费额', 'annuityTotalPayment', 'number',
+        'qbjfe');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157113, null, null, null, 0, 'all_teams', '1', '110', '是否一次性领取', 'annuityOneTimeReceive', 'string',
+        'sfycxlq');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157114, null, null, null, 0, 'all_teams', '1', '110', '年金领取方式', 'annuityReceiveMethod', 'string',
+        'njlqfs');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157115, null, null, null, 0, 'all_teams', '1', '110', '年金领取原因', 'annuityReceiveReason', 'string',
+        'njlqyy');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157116, null, null, null, 0, 'all_teams', '1', '110', '免税收入', 'annuityTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157117, null, null, null, 0, 'all_teams', '1', '110', '减免税额', 'annuityTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157118, null, null, null, 0, 'all_teams', '1', '110', '商业健康保险', 'annuityHealthInsurance', 'number',
+        'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157119, null, null, null, 0, 'all_teams', '1', '110', '税延养老保险', 'annuityEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157120, null, null, null, 0, 'all_teams', '1', '110', '其他', 'annuityOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157121, null, null, null, 0, 'all_teams', '1', '110', '准予扣除的捐赠额', 'annuityAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157122, null, null, null, 0, 'all_teams', '1', '110', '备注', 'annuityRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157123, null, null, null, 0, 'all_teams', '1', '402', '当期收入额', 'insuranceIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157124, null, null, null, 0, 'all_teams', '1', '402', '免税收入', 'insuranceTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157125, null, null, null, 0, 'all_teams', '1', '402', '商业健康保险', 'insuranceHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157126, null, null, null, 0, 'all_teams', '1', '402', '税延养老保险', 'insuranceEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157127, null, null, null, 0, 'all_teams', '1', '402', '其他', 'insuranceOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157128, null, null, null, 0, 'all_teams', '1', '402', '备注', 'insuranceRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157129, null, null, null, 0, 'all_teams', '1', '402', '减免税额', 'insuranceTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157130, null, null, null, 0, 'all_teams', '1', '402', '允许扣除税费', 'insuranceAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157131, null, null, null, 0, 'all_teams', '1', '403', '当期收入额', 'securitiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157132, null, null, null, 0, 'all_teams', '1', '403', '免税收入', 'securitiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157133, null, null, null, 0, 'all_teams', '1', '403', '商业健康保险', 'securitiesHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157134, null, null, null, 0, 'all_teams', '1', '403', '税延养老保险', 'securitiesEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157135, null, null, null, 0, 'all_teams', '1', '403', '其他', 'securitiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157136, null, null, null, 0, 'all_teams', '1', '403', '备注', 'securitiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157137, null, null, null, 0, 'all_teams', '1', '403', '减免税额', 'securitiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157138, null, null, null, 0, 'all_teams', '1', '403', '允许扣除税费', 'securitiesAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157139, null, null, null, 0, 'all_teams', '1', '489', '当期收入额', 'otherContinuousLaborIncome',
+        'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157140, null, null, null, 0, 'all_teams', '1', '489', '免税收入', 'otherContinuousLaborTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157141, null, null, null, 0, 'all_teams', '1', '489', '商业健康保险',
+        'otherContinuousLaborHealthInsurance', 'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157142, null, null, null, 0, 'all_teams', '1', '489', '税延养老保险',
+        'otherContinuousLaborEndowmentInsurance', 'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157143, null, null, null, 0, 'all_teams', '1', '489', '其他', 'otherContinuousLaborOther', 'number',
+        'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157144, null, null, null, 0, 'all_teams', '1', '489', '备注', 'otherContinuousLaborRemark', 'string',
+        'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157145, null, null, null, 0, 'all_teams', '1', '489', '减免税额', 'otherContinuousLaborTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157146, null, null, null, 0, 'all_teams', '1', '489', '允许扣除税费',
+        'otherContinuousLaborAllowedDeductTax', 'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157147, null, null, null, 0, 'all_teams', '1', '499', '当期收入额', 'otherLaborIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157149, null, null, null, 0, 'all_teams', '1', '499', '免税收入', 'otherLaborTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157150, null, null, null, 0, 'all_teams', '1', '499', '商业健康保险', 'otherLaborHealthInsurance',
+        'number', 'syjkbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157151, null, null, null, 0, 'all_teams', '1', '499', '税延养老保险', 'otherLaborEndowmentInsurance',
+        'number', 'syylbx');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157152, null, null, null, 0, 'all_teams', '1', '499', '允许扣除税费', 'otherLaborAllowedDeductTax',
+        'number', 'yxkcsf');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157153, null, null, null, 0, 'all_teams', '1', '499', '其他', 'otherLaborOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157154, null, null, null, 0, 'all_teams', '1', '499', '备注', 'otherLaborRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157155, null, null, null, 0, 'all_teams', '1', '499', '减免税额', 'otherLaborTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157156, null, null, null, 0, 'all_teams', '1', '500', '当期收入额', 'authorIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157157, null, null, null, 0, 'all_teams', '1', '500', '免税收入', 'authorTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157158, null, null, null, 0, 'all_teams', '1', '500', '其他', 'authorOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157159, null, null, null, 0, 'all_teams', '1', '500', '减免税额', 'authorTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157160, null, null, null, 0, 'all_teams', '1', '500', '备注', 'authorRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157161, null, null, null, 0, 'all_teams', '1', '600', '当期收入额', 'royaltiesIncome', 'number', 'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157162, null, null, null, 0, 'all_teams', '1', '600', '免税收入', 'royaltiesTaxFreeIncome', 'number',
+        'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157163, null, null, null, 0, 'all_teams', '1', '600', '其他', 'royaltiesOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157164, null, null, null, 0, 'all_teams', '1', '600', '备注', 'royaltiesRemark', 'string', 'bz');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157165, null, null, null, 0, 'all_teams', '1', '600', '减免税额', 'royaltiesTaxDeduction', 'number',
+        'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157166, null, null, null, 0, 'all_teams', '1', '109', '本月股权激励收入', 'stockRightIncome', 'number',
+        'sre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157167, null, null, null, 0, 'all_teams', '1', '109', '本年累计股权激励收入(不含本月)', 'stockRightAddUpIncome',
+        'number', 'ljsre');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157168, null, null, null, 0, 'all_teams', '1', '109', '本年累计其他', 'stockRightOther', 'number', 'qt');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157169, null, null, null, 0, 'all_teams', '1', '109', '本年累计准予扣除的捐赠额', 'stockRightAllowedDonation',
+        'number', 'zykcjze');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157170, null, null, null, 0, 'all_teams', '1', '109', '本年累计减免税额', 'stockRightTaxDeduction',
+        'number', 'jmse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157171, null, null, null, 0, 'all_teams', '1', '109', '本年累计已扣缴税额', 'stockRightAddUpAdvanceTax',
+        'number', 'ykjse');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157172, null, null, null, 0, 'all_teams', '1', '109', '本年累计免税收入', 'stockRightTaxFreeIncome',
+        'number', 'mssd');
+/
+
+INSERT INTO hrsa_tax_report_column (id, create_time, update_time, creator, delete_type, tenant_key, tax_report_type,
+                                    income_category, report_column_name, report_column_data_index, data_type,
+                                    request_param_key)
+VALUES (805915446042157173, null, null, null, 0, 'all_teams', '1', '109', '备注', 'stockRightRemark', 'string', 'bz');
+/
+

resource/sqlupgrade/JC/sql202308150603.sql

@@ -0,0 +1,62 @@
+create table hrsa_sob_add_up_rule
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  salary_sob_id number,
+  income_category varchar2(100),
+  salary_item_id number,
+  add_up_column_data_index varchar2(100)
+);
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpIncome', 'addUpSubtraction', 'addUpSocialSecurityTotal', 'addUpAccumulationFundTotal',
+                           'addUpEnterpriseAndOther', 'addUpOtherDeduction', 'addUpTaxExemptIncome',
+                           'addUpAllowedDonation', 'addUpTaxSavings');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpTaxPayable' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpAdvanceTax';
+/
+
+delete from hrsa_sob_add_up_rule
+where income_category = 1
+  and add_up_column_data_index in ('addUpTaxPayable', 'addUpAdvanceTax');
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, 'addUpAdvanceTax' as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code = 'addUpTaxPayable';
+/
+
+insert into hrsa_sob_add_up_rule(id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+                                 income_category, salary_item_id, add_up_column_data_index)
+select id, create_time, update_time, creator, delete_type, tenant_key, salary_sob_id,
+       income_category, salary_item_id, salary_item_code as add_up_column_data_index
+from hrsa_salary_sob_item
+where delete_type = 0
+  and income_category = 1
+  and salary_item_code in ('addUpTaxableIncome','addUpTaxFreeIncome','addUpTaxDeduction');
+/
+

resource/sqlupgrade/JC/sql202308170103.sql

@@ -0,0 +1,3 @@
+alter table hrsa_tax_payment_request add feedback int;
+/
+

resource/sqlupgrade/JC/sql202308230303.sql

@@ -0,0 +1,6 @@
+alter table hrsa_tax_agent_tax_return  add city_name  varchar2(400);
+/
+
+update  hrsa_salary_sob_default_item set delete_type=1 where sys_salary_item_id = 700769462612156416;
+/
+

resource/sqlupgrade/JC/sql202308240201.sql

@@ -0,0 +1,47 @@
+delete from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544827,'智能算薪' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544827 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'Intelligent salary calculation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544827 as indexid ,'智能算薪' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544827 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is null ) ;
+/
+
+insert into HtmlLabelIndex(id,indexdesc) select  544826,'人员信息报送' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 544826 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人员信息报送' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'Personnel information submission' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+
+delete from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  544826 as indexid ,'人員信息報送' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 544826 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/

resource/sqlupgrade/JC/sql202308240302.sql

@@ -0,0 +1,29 @@
+Delete from LeftMenuInfo where id=100191;
+/
+
+Delete from LeftMenuConfig where infoid=100191;
+/
+
+call LMConfig_U_ByInfoInsert (2,100181,1);
+/
+
+call LMInfo_Insert (100191,544827,'','',2,100181,1,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/intelligentCalculateSalarySettings' where id = 100191;
+/
+
+Delete from LeftMenuInfo where id=100192;
+/
+
+Delete from LeftMenuConfig where infoid=100192;
+/
+
+call LMConfig_U_ByInfoInsert (2,100118,7);
+/
+
+call LMInfo_Insert (100192,544826,'','',2,100118,7,18);
+/
+
+update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/employeedeclare' where id = 100192;
+/

resource/sqlupgrade/JC/sql202308280203.sql

@@ -0,0 +1,47 @@
+create table hrsa_tax_api_flow_receiver
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  warn_config_id number not null,
+  employee_id number not null,
+  email varchar2(100),
+  mobile varchar2(50)
+);
+/
+
+create table hrsa_tax_api_flow_record
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  tax_agent_id number not null,
+  tax_month date not null,
+  use_time date not null,
+  deduct int,
+  employee_id number not null,
+  business_type int not null,
+  result_status int not null
+);
+/
+
+create table hrsa_tax_api_flow_warn_config
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  enable_warn int default 0 not null,
+  threshold int default 0 not null,
+  business_id number default '0' not null
+);
+/
+

resource/sqlupgrade/JC/sql202309040303.sql

@@ -0,0 +1,40 @@
+create table hrsa_add_up_deduction_request
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  request_status number default 1 not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null,
+  tax_agent_id number not null
+);
+/
+
+alter table hrsa_add_up_deduction_request add lock_version int;
+/
+
+alter table hrsa_add_up_deduction_request modify lock_version default 0;
+/
+
+create table hrsa_add_up_deduction_req_fail
+(
+  id number primary key ,
+  create_time date,
+  update_time date,
+  creator number,
+  delete_type int default 0,
+  tenant_key varchar2(10),
+  request_id number not null,
+  employee_id number not null,
+  employee_type int not null,
+  tax_agent_id number not null,
+  reason varchar2(255) not null,
+  tax_year_month date not null,
+  outer_request_id varchar2(50) not null
+);
+/
+