parent
1d464e5138
commit
8f1e5a61bb
|
|
@ -50,7 +50,9 @@
|
|||
|
||||
<!-- 表字段 -->
|
||||
<sql id="baseColumns">
|
||||
t.id
|
||||
t
|
||||
.
|
||||
id
|
||||
, t.employee_id
|
||||
, t.bill_month
|
||||
, t.bill_status
|
||||
|
|
@ -97,8 +99,6 @@
|
|||
</sql>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- 批量删除 -->
|
||||
<delete id="batchDelAccountTempDetails">
|
||||
UPDATE hrsa_bill_detail_temp
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
|
||||
|
||||
<insert id="batchSaveAccountTempDetails">
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
(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,
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
</foreach>
|
||||
</insert>
|
||||
<insert id="batchSaveAccountTempDetails" databaseId="oracle">
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
(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,
|
||||
|
|
@ -175,59 +175,59 @@
|
|||
|
||||
<foreach collection="accounts" item="item" separator="union all">
|
||||
select
|
||||
#{item.employeeId},
|
||||
#{item.billMonth},
|
||||
#{item.billStatus},
|
||||
#{item.paymentStatus},
|
||||
#{item.supplementaryMonth},
|
||||
#{item.resourceFrom},
|
||||
#{item.socialPayOrg},
|
||||
#{item.socialAccount},
|
||||
#{item.socialSchemeId},
|
||||
#{item.socialPaymentBaseString},
|
||||
#{item.fundPayOrg},
|
||||
#{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.employeeId,jdbcType=DOUBLE},
|
||||
#{item.billMonth,jdbcType=VARCHAR},
|
||||
#{item.billStatus,jdbcType=INTEGER},
|
||||
#{item.paymentStatus,jdbcType=INTEGER},
|
||||
#{item.supplementaryMonth,jdbcType=VARCHAR},
|
||||
#{item.resourceFrom,jdbcType=INTEGER},
|
||||
#{item.socialPayOrg,jdbcType=DOUBLE},
|
||||
#{item.socialAccount,jdbcType=VARCHAR},
|
||||
#{item.socialSchemeId,jdbcType=DOUBLE},
|
||||
#{item.socialPaymentBaseString,jdbcType=VARCHAR},
|
||||
#{item.fundPayOrg,jdbcType=DOUBLE},
|
||||
#{item.fundAccount,jdbcType=VARCHAR},
|
||||
#{item.supplementFundAccount,jdbcType=VARCHAR},
|
||||
#{item.fundSchemeId,jdbcType=DOUBLE},
|
||||
#{item.fundPaymentBaseString,jdbcType=VARCHAR},
|
||||
#{item.otherPayOrg,jdbcType=DOUBLE},
|
||||
#{item.otherSchemeId,jdbcType=DOUBLE},
|
||||
#{item.otherPaymentBaseString,jdbcType=VARCHAR},
|
||||
#{item.socialPerJson,jdbcType=VARCHAR},
|
||||
#{item.socialPerSum,jdbcType=VARCHAR},
|
||||
#{item.fundPerJson,jdbcType=VARCHAR},
|
||||
#{item.fundPerSum,jdbcType=VARCHAR},
|
||||
#{item.otherPerJson,jdbcType=VARCHAR},
|
||||
#{item.otherPerSum,jdbcType=VARCHAR},
|
||||
#{item.perSum,jdbcType=VARCHAR},
|
||||
#{item.socialComJson,jdbcType=VARCHAR},
|
||||
#{item.socialComSum,jdbcType=VARCHAR},
|
||||
#{item.fundComJson,jdbcType=VARCHAR},
|
||||
#{item.fundComSum,jdbcType=VARCHAR},
|
||||
#{item.otherComJson,jdbcType=VARCHAR},
|
||||
#{item.otherComSum,jdbcType=VARCHAR},
|
||||
#{item.comSum,jdbcType=VARCHAR},
|
||||
#{item.socialSum,jdbcType=VARCHAR},
|
||||
#{item.fundSum,jdbcType=VARCHAR},
|
||||
#{item.otherSum,jdbcType=VARCHAR},
|
||||
#{item.total,jdbcType=VARCHAR},
|
||||
#{item.creator,jdbcType=DOUBLE},
|
||||
#{item.createTime},
|
||||
#{item.updateTime},
|
||||
#{item.deleteType},
|
||||
#{item.tenantKey},
|
||||
#{item.paymentOrganization}
|
||||
#{item.tenantKey,jdbcType=VARCHAR},
|
||||
#{item.paymentOrganization,jdbcType=DOUBLE}
|
||||
from dual
|
||||
</foreach>
|
||||
</insert>
|
||||
<insert id="batchSaveAccountTempDetails" databaseId="sqlserver">
|
||||
<foreach collection="accounts" item="item" separator=";">
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
(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,payment_organization)
|
||||
VALUES
|
||||
INSERT INTO hrsa_bill_detail_temp
|
||||
(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,payment_organization)
|
||||
VALUES
|
||||
(
|
||||
#{item.employeeId},
|
||||
#{item.billMonth},
|
||||
|
|
@ -286,14 +286,13 @@
|
|||
AND t.payment_organization = #{paymentOrganization}
|
||||
</if>
|
||||
<if test="employeeIds != null and employeeIds.size()>0">
|
||||
AND t.employee_id IN
|
||||
<foreach collection="employeeIds" open="(" item="employeeId" separator="," close=")">
|
||||
#{employeeId}
|
||||
</foreach>
|
||||
AND t.employee_id IN
|
||||
<foreach collection="employeeIds" open="(" item="employeeId" separator="," close=")">
|
||||
#{employeeId}
|
||||
</foreach>
|
||||
</if>
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -371,7 +371,7 @@
|
|||
<if test="param.keyword != null and param.keyword != ''">
|
||||
AND
|
||||
(
|
||||
userName like CONCAT('%',#{param.userName},'%')
|
||||
userName like CONCAT('%',#{param.keyword},'%')
|
||||
)
|
||||
</if>
|
||||
<if test="param.userName != null and param.userName != ''">
|
||||
|
|
|
|||
|
|
@ -119,6 +119,8 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
|
|||
PageInfo<SalarySobRangeListDTO> pageInfo = new PageInfo<SalarySobRangeListDTO>(salarySobRangeListDTOS,SalarySobRangeListDTO.class);
|
||||
pageInfo.setTotal(salarySobRangeListDTOS.size());
|
||||
pageInfo.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), salarySobRangeListDTOS));
|
||||
pageInfo.setPageNum(queryParam.getCurrent());
|
||||
pageInfo.setPageSize(queryParam.getPageSize());
|
||||
return pageInfo;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue