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

归档删除

This commit is contained in:
MustangDeng 2022-06-10 10:56:09 +08:00
parent 85f0b1164c
commit 3d43cc3f56
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -1304,8 +1304,8 @@ public class SIAccountBiz extends Service {
updateBatchAccount(AccountParam.builder().billMonth(param.get(0).getBillMonth()).paymentOrganization(param.get(0).getPaymentOrganization()).build(), employeeId, SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, currentUserName);
}
public void file(String billMonth, Long employeeId) {
// TODO 归档前检查是否有核算异常
public void file(String billMonth, Long employeeId, Long paymentOrganization) {
// 归档前检查是否有核算异常
// List<InsuranceAccountInspectPO> insuranceAccountInspectPOS = MapperProxyFactory.getProxy(InsuranceAccountInspectMapper.class).getByInspectStatusAndBillMonth(InspectStatusEnum.IGNORE.getValue(),billMonth);
// SalaryAssert.isEmpty(insuranceAccountInspectPOS, SalaryI18nUtil.getI18nLabel( 100500, "当前核算月存在核算异常数据"));
@ -1315,6 +1315,7 @@ public class SIAccountBiz extends Service {
SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(100503, "月份账单不存在"));
SalaryAssert.isFalse(insuranceAccountBatchPO.getBillStatus() == BillStatusEnum.ARCHIVED.getValue(), SalaryI18nUtil.getI18nLabel(100504, "月份账单已归档"));
insuranceAccountBatchPO.setBillStatus(BillStatusEnum.ARCHIVED.getValue());
insuranceAccountBatchPO.setPaymentOrganization(paymentOrganization);
MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).updateById(insuranceAccountBatchPO);
//日志记录
// LoggerContext insuranceSchemeContext = new LoggerContext();

3
src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
View File

@ -214,6 +214,9 @@
bill_status=#{billStatus}
</set>
WHERE id = #{id} AND delete_type = 0
<if test="paymentOrganization != null">
AND payment_organization = #{paymentOrganization}
</if>
</update>

6
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -340,8 +340,10 @@
FROM hrsa_bill_detail
WHERE delete_type = 0
AND bill_month = #{billMonth}
AND payment_organization = #{paymentOrganization}
AND bill_status = 0
AND bill_status = 0
<if test="paymentOrganization != null">
AND payment_organization = #{paymentOrganization}
</if>
</delete>

3
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -341,7 +341,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
public void deleteSummplementaryAccount(List<SupplementAccountBaseParam> supplementAccountBaseParams) {
Long employeeId = (long)user.getUID();
String currentUserName = user.getLastname();
getSiAccountBiz(user).deleteSupplementaryAccount(supplementAccountBaseParams,employeeId,currentUserName);
}
@ -349,7 +348,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
public void file(AccountParam accountParam) {
Long employeeId = (long)user.getUID();
String billMonth = accountParam.getBillMonth();
getSiAccountBiz(user).file(billMonth,employeeId);
getSiAccountBiz(user).file(billMonth,employeeId, accountParam.getPaymentOrganization());
}
@Override