diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 95ab6356c..cf24d00d8 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -678,6 +678,7 @@ public class SIAccountBiz extends Service{ } } InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillMonth(billMonth); + DataCollectionEmployee simpleEmployee = MapperProxyFactory.getProxy(EmployMapper.class).getEmployeeById(employeeId); insuranceAccountBatchPO.setAccountant(currentUserName); insuranceAccountBatchPO.setUpdateTime(new Date()); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java index 11369fd63..24262cceb 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java @@ -23,7 +23,7 @@ public interface InsuranceAccountBatchMapper { List list(@Param("param")InsuranceAccountBatchParam queryParam); /** - * 根据账单月份查询单条记录 + * 根据账单月份查询 * @param billMonth * @return */ diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml index b966a0680..ceeeb106f 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml @@ -109,7 +109,7 @@ - SELECT FROM diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 1e2382487..c675270b2 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -304,10 +304,10 @@ INSERT INTO hrsa_bill_detail - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) VALUES ( @@ -316,53 +316,51 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} ) INSERT INTO hrsa_bill_detail - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) - + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) select #{item.employeeId}, @@ -370,42 +368,41 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} from dual @@ -413,10 +410,10 @@ INSERT INTO hrsa_bill_detail - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) VALUES ( #{item.employeeId}, @@ -424,42 +421,41 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} ) diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index f5c327cbc..c6719b37f 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -112,10 +112,10 @@ INSERT INTO hrsa_bill_detail_temp - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) VALUES ( @@ -124,52 +124,51 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} ) INSERT INTO hrsa_bill_detail_temp - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) select @@ -178,42 +177,41 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} from dual @@ -221,10 +219,10 @@ INSERT INTO hrsa_bill_detail_temp - (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, - fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, - social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, - fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) + (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, + fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, + social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key) VALUES ( #{item.employeeId}, @@ -232,42 +230,41 @@ #{item.billStatus}, #{item.paymentStatus}, #{item.supplementaryMonth}, - #{item.supplementaryProjects}, #{item.resourceFrom}, #{item.socialPayOrg}, #{item.socialAccount}, + #{item.socialSchemeId}, + #{item.socialPaymentBaseString}, #{item.fundPayOrg}, - #{item.fundAccount} - #{item.supplementFundAccount} - #{item.otherPayOrg} - #{item.socialSchemeId} - #{item.socialPaymentBaseString} - #{item.fundSchemeId} - #{item.fundPaymentBaseString} - #{item.otherSchemeId} - #{item.otherPaymentBaseString} - #{item.socialPerJson} - #{item.socialPerSum} - #{item.fundPerJson} - #{item.fundPerSum} - #{item.otherPerJson} - #{item.otherPerSum} - #{item.perSum} - #{item.socialComJson} - #{item.socialComSum} - #{item.fundComJson} - #{item.fundComSum} - #{item.otherComJson} - #{item.otherComSum} - #{item.comSum} - #{item.socialSum} - #{item.fundSum} - #{item.otherSum} - #{item.total} - #{item.creator} - #{item.deleteType} - #{item.createTime} - #{item.updateTime} + #{item.fundAccount}, + #{item.supplementFundAccount}, + #{item.fundSchemeId}, + #{item.fundPaymentBaseString}, + #{item.otherPayOrg}, + #{item.otherSchemeId}, + #{item.otherPaymentBaseString}, + #{item.socialPerJson}, + #{item.socialPerSum}, + #{item.fundPerJson}, + #{item.fundPerSum}, + #{item.otherPerJson}, + #{item.otherPerSum}, + #{item.perSum}, + #{item.socialComJson}, + #{item.socialComSum}, + #{item.fundComJson}, + #{item.fundComSum}, + #{item.otherComJson}, + #{item.otherComSum}, + #{item.comSum}, + #{item.socialSum}, + #{item.fundSum}, + #{item.otherSum}, + #{item.total}, + #{item.creator}, + #{item.createTime}, + #{item.updateTime}, + #{item.deleteType}, #{item.tenantKey} ) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 398bac626..7690de42d 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -81,7 +81,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List insuranceAccountBatchListDTOS = InsuranceAccountBO.buildAccountBatchDTOList(insuranceAccountBatchPOS); PageInfo pageInfos = new PageInfo<>(insuranceAccountBatchListDTOS,InsuranceAccountBatchListDTO.class); - pageInfos.setTotal(insuranceAccountBatchListDTOS.size()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(queryParam.getCurrent()); pageInfos.setPageSize(queryParam.getPageSize()); @@ -151,7 +151,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //数据组装 List> records = getService(user).buildCommonRecords(insuranceAccountDetailPOS, employeeId); PageInfo> pageInfos = new PageInfo<>(records); - pageInfos.setTotal(records.size()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(queryParam.getCurrent()); pageInfos.setPageSize(queryParam.getPageSize()); @@ -202,7 +202,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //数据组装 List> records = getService(user).buildCommonRecords(insuranceAccountDetailPOS, employeeId); PageInfo> pageInfos = new PageInfo<>(records); - pageInfos.setTotal(records.size()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(queryParam.getCurrent()); pageInfos.setPageSize(queryParam.getPageSize()); @@ -402,10 +402,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public Map changeList(InsuranceAccountDetailParam param) { Map datas = new HashMap<>(); Long employeeId = (long)user.getUID(); + PageUtil.start(param.getCurrent(),param.getPageSize()); List insuranceArchivesEmployeePOS = MapperProxyFactory.getProxy(InsuranceAccountDetailMapper.class).changeList(param.getUserName(), param.getCurrent(), param.getPageSize()); + PageInfo pageInfo = new PageInfo<>(insuranceArchivesEmployeePOS); + List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); PageInfo> pageInfos = new PageInfo<>(records); - pageInfos.setTotal(records.size()); + pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(param.getCurrent()); pageInfos.setPageSize(param.getPageSize()); @@ -461,6 +464,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public Map getInspectTable(InsuranceAccountDetailParam param) { Map datas = new HashMap<>(); + PageUtil.start(param.getCurrent(),param.getPageSize()); List insuranceAccountInspectPOS = MapperProxyFactory.getProxy(InsuranceAccountInspectMapper.class).getByBillMonth(param.getBillMonth()); List> records = getService(user).buildInspectRecords(insuranceAccountInspectPOS);