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 11:46:57 +08:00
parent 3d43cc3f56
commit e1440e9203
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1310,7 +1310,7 @@ public class SIAccountBiz extends Service {
// SalaryAssert.isEmpty(insuranceAccountInspectPOS, SalaryI18nUtil.getI18nLabel( 100500, "当前核算月存在核算异常数据"));
//开始归档数据
InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillStatus(billMonth, BillStatusEnum.NOT_ARCHIVED.getValue());
InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillStatus(billMonth, BillStatusEnum.NOT_ARCHIVED.getValue(), paymentOrganization);
SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(100503, "月份账单不存在"));
SalaryAssert.isFalse(insuranceAccountBatchPO.getBillStatus() == BillStatusEnum.ARCHIVED.getValue(), SalaryI18nUtil.getI18nLabel(100504, "月份账单已归档"));

2
src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
View File

@ -55,7 +55,7 @@ public interface InsuranceAccountBatchMapper {
* @param billStatus
* @return
*/
InsuranceAccountBatchPO getByBillStatus(@Param("billMonth") String billMonth,@Param("billStatus")Integer billStatus);
InsuranceAccountBatchPO getByBillStatus(@Param("billMonth") String billMonth,@Param("billStatus")Integer billStatus, @Param("paymentOrganization") Long paymentOrganization);
List<InsuranceAccountBatchPO> listByTimeRange(@Param("minDate") String minDate, @Param("maxDate") String maxDate);

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

@ -189,6 +189,9 @@
WHERE t.delete_type = 0
AND t.bill_month = #{billMonth}
AND t.bill_status = #{billStatus}
<if test="paymentOrganization != null">
AND t.payment_organization = #{paymentOrganization}
</if>
</select>