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

Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01

This commit is contained in:
sy 2022-11-03 21:05:44 +08:00
parent f1f8ae53af d279884168
commit b1f1da3686
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,8 +808,8 @@ public class SIArchivesBiz {
return true;
}
//设置缴纳对象和缴费状态
Integer paymentScope = 2;
Integer isPayment = 1;
// Integer paymentScope = 2;
// Integer isPayment = 1;
Map<String, String> paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap<String, String>().getClass());
if (paymentBaseJson == null) {
return true;
@ -826,12 +826,13 @@ public class SIArchivesBiz {
}
//根据福利方案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()));
List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().getByPI(primaryId, Long.valueOf(entry.getKey()));
log.info("福利方案id: {},, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey()));
if (insuranceSchemeDetailPOList.size() == 0) {
log.info("根据福利方案id、险种id、缴纳对象查询明细为null！福利方案id: {}, 缴纳所属： {}, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey()));
return false;
}
InsuranceSchemeDetailPO insuranceSchemeDetailPO = insuranceSchemeDetailPOList.get(0);
InsuranceSchemeDetailPOEncrypt.decryptItem(insuranceSchemeDetailPO);
String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit();

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

@ -56,8 +56,7 @@ 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);
List<InsuranceSchemeDetailPO> getByPI(@Param("primaryId") Long primaryId, @Param("insuranceId") Long insuranceId);
/**
* 根据主键和是否缴费查询

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

@ -95,14 +95,12 @@
AND delete_type = 0
</select>
<select id="getByPPII" resultMap="BaseResultMap" >
<select id="getByPI" 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>