From 0aabf7df6c1f25e0ae8e773c9b9d40de283507ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 22 Jan 2025 15:06:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86sql=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202501150103.sql | 36 +++++++++---------- resource/sqlupgrade/GS/sql202501150103.sql | 36 +++++++++---------- resource/sqlupgrade/JC/sql202501150103.sql | 36 +++++++++---------- .../sqlupgrade/Oracle/sql202501150103.sql | 36 +++++++++---------- resource/sqlupgrade/ST/sql202501150103.sql | 36 +++++++++---------- 5 files changed, 90 insertions(+), 90 deletions(-) diff --git a/resource/sqlupgrade/DM/sql202501150103.sql b/resource/sqlupgrade/DM/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/DM/sql202501150103.sql +++ b/resource/sqlupgrade/DM/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/GS/sql202501150103.sql b/resource/sqlupgrade/GS/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/GS/sql202501150103.sql +++ b/resource/sqlupgrade/GS/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/JC/sql202501150103.sql b/resource/sqlupgrade/JC/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/JC/sql202501150103.sql +++ b/resource/sqlupgrade/JC/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/Oracle/sql202501150103.sql b/resource/sqlupgrade/Oracle/sql202501150103.sql index 7817d23d0..ee779a50f 100644 --- a/resource/sqlupgrade/Oracle/sql202501150103.sql +++ b/resource/sqlupgrade/Oracle/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , diff --git a/resource/sqlupgrade/ST/sql202501150103.sql b/resource/sqlupgrade/ST/sql202501150103.sql index c8b71336f..a51508d84 100644 --- a/resource/sqlupgrade/ST/sql202501150103.sql +++ b/resource/sqlupgrade/ST/sql202501150103.sql @@ -6,36 +6,36 @@ loginid varchar2(100), LASTNAME varchar2(60), SEX char(1), BIRTHDAY char(10) , -NATIONALITY int(0) , +NATIONALITY int , MARITALSTATUS char(1) , TELEPHONE varchar2(60), MOBILE varchar2(60) , MOBILECALL varchar2(60) , EMAIL varchar2(60), -LOCATIONID int(0), +LOCATIONID int, WORKROOM varchar2(60), HOMEADDRESS varchar2(100), RESOURCETYPE char(1) , STARTDATE char(10) , ENDDATE char(10), -JOBTITLE int(0) , +JOBTITLE int , JOBTITLENAME varchar2(200) , JOBACTIVITYDESC varchar2(200), -JOBLEVEL int(0) , -SECLEVEL int(0) , -DEPARTMENTID int(0) , +JOBLEVEL int , +SECLEVEL int , +DEPARTMENTID int , DEPARTMENTNAME varchar2(200) , -SUBCOMPANYID1 int(0) , +SUBCOMPANYID1 int , SUBCOMPANYNAME varchar2(200) , -COSTCENTERID int(0) , -MANAGERID int(0) , -ASSISTANTID int(0), -BANKID1 int(0) , +COSTCENTERID int , +MANAGERID int , +ASSISTANTID int, +BANKID1 int , ACCOUNTID1 varchar2(100) , LASTLOGINDATE char(10) , CERTIFICATENUM varchar2(60) , NATIVEPLACE varchar2(100) , -EDUCATIONLEVEL int(0) , +EDUCATIONLEVEL int , BEMEMBERDATE char(10) , BEPARTYDATE char(10) , WORKCODE varchar2(60) , @@ -44,8 +44,8 @@ HEALTHINFO char(1) , RESIDENTPLACE varchar2(200) , POLICY varchar2(30) , DEGREE varchar2(30) , -USEKIND int(0) , -JOBCALL int(0) , +USEKIND int , +JOBCALL int , jobcallname varchar2(200) , ACCUMFUNDACCOUNT varchar2(30), BIRTHPLACE varchar2(60) , @@ -54,14 +54,14 @@ RESIDENTPHONE varchar2(60) , RESIDENTPOSTCODE varchar2(60) , EXTPHONE varchar2(50) , MANAGERSTR varchar2(500), -STATUS int(0) , +STATUS int , FAX varchar2(60) , ISLABOUUNION char(1), TEMPRESIDENTNUMBER varchar2(60), PROBATIONENDDATE char(10), -COUNTRYID int(0) , -ACCOUNTTYPE int(0) , -BELONGTO int(0) , +COUNTRYID int , +ACCOUNTTYPE int , +BELONGTO int , ACCOUNTNAME varchar2(200) , companystartdate varchar2(10), workstartdate varchar2(10) , From d63702891d051378298628ba261badf4b1387ea9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 6 Feb 2025 13:51:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=A0=B8=E7=AE=97=E4=BA=BA=E6=95=B0=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E1000=E6=97=B6sqlbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/SIAccountServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 18d48fccd..fbf15b7f4 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -5076,8 +5076,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List employeeList = new ArrayList<>(); if (!isFirstFlag) { // 不是首次核算，需要把社保历史数据取出 - historyDetailData.addAll(getInsuranceAccountDetailMapper().list(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(ids).build())); - historyDetailData.addAll(getInsuranceAccountDetailMapper().extList(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(ids).build())); + List> partition = Lists.partition(ids, 100); + partition.forEach(part -> { + historyDetailData.addAll(getInsuranceAccountDetailMapper().list(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(part).build())); + historyDetailData.addAll(getInsuranceAccountDetailMapper().extList(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(part).build())); + }); } else { employeeList = getSalaryEmployeeService(user).listByIds(ids); }