Commit 7cb22d10 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-2000改为5条

parent 5fb32565
...@@ -721,6 +721,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -721,6 +721,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
returnVo = returnR.getData(); returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdThree())) { if (Common.isNotNull(returnVo.getResultIdThree())) {
contractId = returnVo.getResultIdThree(); contractId = returnVo.getResultIdThree();
}
if (Common.isNotNull(returnVo.getResultIdFourStatus())) {
contractIdEnd = returnVo.getResultIdFourStatus(); contractIdEnd = returnVo.getResultIdFourStatus();
} }
} }
......
...@@ -1321,6 +1321,7 @@ ...@@ -1321,6 +1321,7 @@
where a.EMP_IDCARD = #{empIdCard} where a.EMP_IDCARD = #{empIdCard}
and a.SETTLE_DOMAIN_CODE = #{deptNo} and a.SETTLE_DOMAIN_CODE = #{deptNo}
and a.SOCIAL_STATUS = '8' and a.SOCIAL_STATUS = '8'
and d.type = '1'
limit 1 limit 1
</select> </select>
...@@ -1331,6 +1332,7 @@ ...@@ -1331,6 +1332,7 @@
where a.EMP_IDCARD = #{empIdCard} where a.EMP_IDCARD = #{empIdCard}
and a.SETTLE_DOMAIN_CODE_FUND = #{deptNo} and a.SETTLE_DOMAIN_CODE_FUND = #{deptNo}
and a.FUND_STATUS = '7' and a.FUND_STATUS = '7'
and d.type = '1'
limit 1 limit 1
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment