|
|
@ -22,7 +22,9 @@ import cn.iocoder.yudao.module.accounting.service.invoices.InvoicesService;
|
|
|
|
import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService;
|
|
|
|
import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
@ -44,6 +46,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
|
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
|
|
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
|
|
|
|
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
|
|
|
|
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
|
|
|
|
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.accounting.controller.admin.voucher.vo.*;
|
|
|
|
import cn.iocoder.yudao.module.accounting.controller.admin.voucher.vo.*;
|
|
|
@ -144,7 +147,7 @@ public class VoucherController {
|
|
|
|
PageResult<VoucherDO> pageResult = voucherService.getVoucherPage(pageVO);
|
|
|
|
PageResult<VoucherDO> pageResult = voucherService.getVoucherPage(pageVO);
|
|
|
|
int i = 0;
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
|
|
//完整性检查
|
|
|
|
//完整性检查,并设置会计凭证的完整性
|
|
|
|
List<VoucherDO> list = pageResult.getList();
|
|
|
|
List<VoucherDO> list = pageResult.getList();
|
|
|
|
for (VoucherDO voucherDO : list
|
|
|
|
for (VoucherDO voucherDO : list
|
|
|
|
) {
|
|
|
|
) {
|
|
|
@ -201,9 +204,10 @@ public class VoucherController {
|
|
|
|
voucherService.updateVoucher(voucherUpdateReqVO);
|
|
|
|
voucherService.updateVoucher(voucherUpdateReqVO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//查询未归档的会计凭证返回前端
|
|
|
|
|
|
|
|
pageVO.setFileStatus(String.valueOf(0));
|
|
|
|
PageResult<VoucherDO> pageResult2 = voucherService.getVoucherPage(pageVO);
|
|
|
|
PageResult<VoucherDO> pageResult2 = voucherService.getVoucherPage(pageVO);
|
|
|
|
|
|
|
|
|
|
|
|
return success(VoucherConvert.INSTANCE.convertPage(pageResult2));
|
|
|
|
return success(VoucherConvert.INSTANCE.convertPage(pageResult2));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|