ly 1 anno fa
parent
commit
78c32d0a4e

+ 1 - 0
src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/controller/BizFinancialIndividualIncomeTaxDetailController.java

@@ -338,6 +338,7 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
         bizHistory2.setTableName("biz_financial_individual_income_tax");
         bizHistory2.setCompanyId(detail.getCompanyId());
         bizHistory2.setEvent("退回");
+        bizHistory2.setReason(detail.getRefuseReason());
         bizHistory2.setTenantId(getTenantId());
         bizHistory2.setBelongPeriod(detail.getYear() + "-" + String.format("%02d", Integer.valueOf(detail.getMonth())) );
         bizHistoryService.save(bizHistory2);

+ 2 - 0
src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/domain/BizFinancialIndividualIncomeTaxDetail.java

@@ -86,4 +86,6 @@ public class BizFinancialIndividualIncomeTaxDetail extends BaseEntity implements
 
     @TableField(exist = false)
     private BizEntrust entrust;
+
+    private String refuseReason;
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/controller/BizFinancialIndividualIncomeTaxDetailIsZeroController.java

@@ -160,6 +160,7 @@ public class BizFinancialIndividualIncomeTaxDetailIsZeroController extends BaseC
                 bizHistory.setCompanyId(bizFinancialIndividualIncomeTaxDetail.getCompanyId());
                 bizHistory.setBelongPeriod(bizFinancialIndividualIncomeTaxDetail.getYear() + "-" + String.format("%02d", Integer.valueOf(bizFinancialIndividualIncomeTaxDetail.getMonth())) );
                 bizHistory.setEvent("退回");
+                bizHistory.setReason(bizFinancialIndividualIncomeTaxDetail.getRefuseReason());
                 bizHistory.setTenantId(getTenantId());
                 bizHistoryService.save(bizHistory);
                 break;

+ 1 - 1
src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/domain/BizFinancialIndividualIncomeTaxDetailIsZero.java

@@ -62,5 +62,5 @@ public class BizFinancialIndividualIncomeTaxDetailIsZero extends BaseEntity impl
 
     private Date verifierTime;
 
-
+    private String refuseReason;
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -488,6 +488,7 @@ public class BizHousingFundDeclareController extends BaseController {
         bizHistory.setEvent("退回");
         bizHistory.setTenantId(getTenantId());
         bizHistory.setBelongPeriod(detail.getYear() + "-" +String.format("%02d", Integer.valueOf(detail.getMonth())));
+        bizHistory.setReason(detail.getRefuseReason());
         bizHistoryService.save(bizHistory);
         deductionService.removeBatchByIds(deductions.stream().map(BizDeduction::getId).collect(Collectors.toList()));
         return housingFundDeclareDetailService.updateById(detail) && addRecord(detail.getHousingFundDeclareId(), detail.getYear(), detail.getMonth(), SecurityUtils.getUserId(), "公积金申报退回", 1) ? success() : error();

+ 1 - 0
src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundDeclareDetail.java

@@ -86,4 +86,5 @@ public class BizHousingFundDeclareDetail extends BaseEntity implements Serializa
     @ApiModelProperty("审核人")
     private Long verifierId;
     private java.util.Date verifierTime;
+    private String refuseReason;
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/business/reportTax/controller/BizFinancialReportTaxNonZeroController.java

@@ -544,6 +544,7 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
         bizHistory.setCompanyId(detail.getCompanyId());
         bizHistory.setBelongPeriod(detail.getYear() + "-" + String.format("%02d", Integer.valueOf(detail.getMonth())) );
         bizHistory.setEvent("退回");
+        bizHistory.setReason(detail.getRefuseReason());
         bizHistory.setTenantId(getTenantId());
         bizHistoryService.save(bizHistory);
         return financialReportTaxDetaiIsZerolService.updateById(detail) ? success() : error();

+ 1 - 0
src/main/java/cn/ezhizao/project/business/reportTaxIsZero/controller/BizFinancialReportTaxController.java

@@ -542,6 +542,7 @@ public class BizFinancialReportTaxController extends BaseController {
         bizHistory.setCompanyId(detail.getCompanyId());
         bizHistory.setBelongPeriod(detail.getYear() + "-" + String.format("%02d", Integer.valueOf(detail.getMonth())) );
         bizHistory.setEvent("退回");
+        bizHistory.setReason(detail.getRefuseReason());
         bizHistory.setTenantId(getTenantId());
         bizHistoryService.save(bizHistory);
         return financialReportTaxDetailService.updateById(detail) ? success() : error();

+ 2 - 0
src/main/java/cn/ezhizao/project/business/reportTaxIsZero/domain/BizFinancialReportTaxDetail.java

@@ -96,4 +96,6 @@ public class BizFinancialReportTaxDetail extends BaseEntity {
 
 
     private Date verifierTime;
+
+    private String refuseReason;
 }

+ 1 - 0
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -635,6 +635,7 @@ public class SocialSecurityDeclareController extends BaseController {
         bizHistory.setTableName("biz_social_security_declare");
         bizHistory.setCompanyId(detail.getCompanyId());
         bizHistory.setEvent("退回");
+        bizHistory.setReason(detail.getRefuseReason());
         bizHistory.setTenantId(getTenantId());
         bizHistory.setBelongPeriod(detail.getYear() + "-" +String.format("%02d", Integer.valueOf(detail.getMonth())));
         bizHistoryService.save(bizHistory);

+ 2 - 0
src/main/java/cn/ezhizao/project/business/socialSecurity/domain/BizSocialSecurityDeclareDetail.java

@@ -120,4 +120,6 @@ public class BizSocialSecurityDeclareDetail extends BaseEntity implements Serial
     @TableField(exist = false)
     private BizEntrust entrust;
 
+    private String refuseReason;
+
 }