|
@@ -43,6 +43,7 @@ import cn.ezhizao.project.business.keepAccounts.service.IBizFinancialKeepAccount
|
|
|
import cn.ezhizao.project.business.receiveTicket.domain.BizFinancialReceiveTicketDetail;
|
|
|
import cn.ezhizao.project.business.receiveTicket.service.IBizFinancialReceiveTicketDetailService;
|
|
|
import cn.ezhizao.project.business.receiveTicket.service.IBizFinancialReceiveTicketService;
|
|
|
+import cn.ezhizao.project.business.reportTaxIsZero.domain.BizFinancialReportTaxDetail;
|
|
|
import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
|
|
|
import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
|
|
|
import cn.ezhizao.project.business.salary.domain.vo.BizFinancialSalaryDetailEmployeeNotCompany;
|
|
@@ -513,7 +514,7 @@ public class BizFinancialSalaryController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('business:salary:verify')")
|
|
|
@PostMapping("/verifyDetail")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public AjaxResult verifyDetail(@RequestBody BizFinancialSalaryDetail bizFinancialSalaryDetail) {
|
|
|
+ public AjaxResult verifyDetail(@RequestBody BizFinancialSalaryDetail bizFinancialSalaryDetail) throws Exception {
|
|
|
String join = LockKey.join(LockKey.VERIFYNOZERO, getUserId());
|
|
|
DistributionLock lock = new DistributionLock(join);
|
|
|
try {
|
|
@@ -521,6 +522,18 @@ public class BizFinancialSalaryController extends BaseController {
|
|
|
boolean bool = true;
|
|
|
bizFinancialSalaryDetail.setVerifierId(SecurityUtils.getUserId());
|
|
|
if (bizFinancialSalaryDetail.getStatus().equals(3)) {
|
|
|
+ if(null == bizFinancialSalaryDetail.getId()){
|
|
|
+ Long count = bizFinancialSalaryDetailService
|
|
|
+ .lambdaQuery()
|
|
|
+ .eq(BizFinancialSalaryDetail::getDeleted,0)
|
|
|
+ .eq(BizFinancialSalaryDetail::getYear,bizFinancialSalaryDetail.getYear())
|
|
|
+ .eq(BizFinancialSalaryDetail::getMonth,bizFinancialSalaryDetail.getMonth())
|
|
|
+ .eq(BizFinancialSalaryDetail::getFinancialSalaryId,bizFinancialSalaryDetail.getFinancialSalaryId())
|
|
|
+ .count();
|
|
|
+ if(null != count && count > 0) {
|
|
|
+ return error("已经保存过数据,不可重复提交");
|
|
|
+ }
|
|
|
+ }
|
|
|
BizFinancialSalary bizFinancialSalary = bizFinancialSalaryService.getById(bizFinancialSalaryDetail.getFinancialSalaryId());
|
|
|
QueryWrapper<BizFinancialIndividualIncomeTaxIsZero> qw = new QueryWrapper<>();
|
|
|
qw.eq("work_order_id", bizFinancialSalary.getWorkOrderId());
|
|
@@ -557,7 +570,7 @@ public class BizFinancialSalaryController extends BaseController {
|
|
|
return toAjax(bool);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- return error("保存失败");
|
|
|
+ throw new Exception("保存失败");
|
|
|
} finally {
|
|
|
lock.unlock();
|
|
|
}
|