qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利模块bug修复v5，根据福利方案id、险种id、缴纳对象、缴费状态查询明细

This commit is contained in:
sy 2022-11-03 17:05:11 +08:00
parent 73289ecef3
commit 51a181f3d1
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -807,8 +807,9 @@ public class SIArchivesBiz {
if (primaryId ==null || paymentBaseString == null) {
return true;
}
//设置缴纳对象
//设置缴纳对象和缴费状态
Integer paymentScope = 2;
Integer isPayment = 1;
Map<String, String> paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap<String, String>().getClass());
if (paymentBaseJson == null) {
return true;
@ -824,8 +825,8 @@ public class SIArchivesBiz {
return false;
}
//根据福利方案id、险种id、缴纳对象查询明细
InsuranceSchemeDetailPO insuranceSchemeDetailPO = getInsuranceSchemeDetailMapper().getByPPI(primaryId, paymentScope, Long.valueOf(entry.getKey()));
//根据福利方案id、险种id、缴纳对象、缴费状态查询明细
InsuranceSchemeDetailPO insuranceSchemeDetailPO = getInsuranceSchemeDetailMapper().getByPPII(primaryId, paymentScope, Long.valueOf(entry.getKey()), isPayment);
log.info("福利方案id: {}, 缴纳所属： {}, 福利明细项id：{}", primaryId, paymentScope, Long.valueOf(entry.getKey()));
if (insuranceSchemeDetailPO == null) {
log.info("根据福利方案id、险种id、缴纳对象查询明细为null！福利方案id: {}, 缴纳所属： {}, 福利明细项id：{}", primaryId, paymentScope, Long.valueOf(entry.getKey()));

2
src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java
View File

@ -56,6 +56,8 @@ public interface InsuranceSchemeDetailMapper {
InsuranceSchemeDetailPO getByPPI(@Param("primaryId") Long primaryId, @Param("paymentScope") Integer paymentScope,
@Param("insuranceId") Long insuranceId);
InsuranceSchemeDetailPO getByPPII(@Param("primaryId") Long primaryId, @Param("paymentScope") Integer paymentScope,
@Param("insuranceId") Long insuranceId, @Param("isPayment") Integer isPayment);
/**
* 根据主键和是否缴费查询

11
src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml
View File

@ -95,6 +95,17 @@
AND delete_type = 0
</select>
<select id="getByPPII" resultMap="BaseResultMap" >
SELECT
<include refid="baseColumns"/>
FROM hrsa_scheme_detail t
WHERE t.insurance_id = #{insuranceId}
AND t.payment_scope = #{paymentScope}
AND t.primary_id = #{primaryId}
AND t.is_payment = #{isPayment}
AND delete_type = 0
</select>
<!-- 插入全部字段 -->
<insert id="insert" parameterType="com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO"
keyProperty="id" keyColumn="id" useGeneratedKeys="true"