no message

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -164,6 +165,16 @@ public class BizHousingFundDeclareController extends BaseController {
     public AjaxResult getDetail(@RequestBody BizHousingFundDeclareDetail condition) {
         List<BizHousingFundDeclareDetail> housingFundDeclareDetails = housingFundDeclareDetailService.getListByBean(condition);
         BizCompany company = companyService.getById(condition.getCompanyId());
+        int nowYear = LocalDate.now().getYear();
+        int nowMonth = LocalDate.now().getMonthValue();
+        String formattedMonth = String.format("%02d", nowMonth);
+        String year = condition.getYear();
+        String month = condition.getMonth();
+        String s1= year+month;
+        String s2 = nowYear+ formattedMonth;
+        if(!s1.equals(s2) && housingFundDeclareDetails.isEmpty()){
+            return error("当前月未找到数据");
+        }
         if (housingFundDeclareDetails.isEmpty()) {
             // 获取上个月的信息
             // 先获取之前的一个月是否已填报，然后获取填报后的信息
@@ -175,6 +186,7 @@ public class BizHousingFundDeclareController extends BaseController {
             } else {
                 condition.setEvidenceFiles(new ArrayList<>());
             }
+            condition.setCompanyName(company.getName());
             condition.setHousingFundPassword(company.getHousingFundPassword());
             condition.setHousingFundUnitAccount(company.getHousingFundUnitAccount());
             condition.setHousingFundDeductionPassword(company.getHousingFundDeductionPassword());

src/main/java/cn/ezhizao/project/business/reportTax/controller/BizFinancialReportTaxNonZeroController.java

@@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -102,13 +103,27 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
 
     @ApiOperation("根据id获得明细")
     @PreAuthorize("@ss.hasPermi('business:financialReportTaxNonZero:query')")
-    @GetMapping("/getDetailById/{id}")
+    @GetMapping("/getDetailById/{id}/{year}/{month}")
     @ResponseBody
-    public AjaxResult getDetailById(@PathVariable Long id) {
+    public AjaxResult getDetailById(@PathVariable Long id, @PathVariable("year") String year, @PathVariable("month") String month) {
+        int nowYear = LocalDate.now().getYear();
+        int nowMonth = LocalDate.now().getMonthValue()-1;
+        String formattedMonth = String.format("%02d", nowMonth);
         BizFinancialReportTaxDetailNonZero conditions = new BizFinancialReportTaxDetailNonZero();
-        conditions.setId(id);
+        conditions.setFinancialReportTaxId(id);
+        conditions.setYear(year);
+        conditions.setMonth(month);
         List<BizFinancialReportTaxDetailNonZero> details = financialReportTaxDetailService.getList(conditions);
         BizFinancialReportTaxDetailNonZero detail = details.isEmpty() ? null : details.get(0);
+        String s1= year+month;
+        String s2 = nowYear+ formattedMonth;
+        if(s1.equals(s2) && detail == null){
+            return success(new BizFinancialReportTaxDetail());
+        }
+        if (detail==null  ) {
+            return error("当前月未找到数据");
+        }
+
         return success(detail);
     }
 

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/controller/BizFinancialReportTaxController.java

@@ -11,6 +11,7 @@ import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.deduction.domain.BizDeduction;
 import cn.ezhizao.project.business.deduction.service.IBizDeductionService;
+import cn.ezhizao.project.business.finance.IndividualIncomeTax.domain.BizFinancialIndividualIncomeTaxDetail;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxDetailIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.service.IBizFinancialIndividualIncomeTaxDetailIsZeroService;
@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -81,14 +83,28 @@ public class BizFinancialReportTaxController extends BaseController {
     }
 
     @ApiOperation("根据id获得明细")
-    @GetMapping("/getDetailById/{id}")
+    @GetMapping("/getDetailById/{id}/{year}/{month}")
     @PreAuthorize("@ss.hasPermi('business:financialReportTax:query')")
     @ResponseBody
-    public AjaxResult getDetailById(@PathVariable Long id) {
+    public AjaxResult getDetailById(@PathVariable Long id, @PathVariable("year") String year, @PathVariable("month") String month) {
+        int nowYear = LocalDate.now().getYear();
+        int nowMonth = LocalDate.now().getMonthValue()-1;
+        String formattedMonth = String.format("%02d", nowMonth);
         BizFinancialReportTaxDetail conditions = new BizFinancialReportTaxDetail();
-        conditions.setId(id);
+        conditions.setFinancialReportTaxId(id);
+        conditions.setYear(year);
+        conditions.setMonth(month);
         List<BizFinancialReportTaxDetail> details = financialReportTaxDetailService.getList(conditions);
         BizFinancialReportTaxDetail detail = details.isEmpty() ? null : details.get(0);
+        String s1= year+month;
+        String s2 = nowYear+ formattedMonth;
+        if(s1.equals(s2) && detail == null){
+            return success(new BizFinancialReportTaxDetail());
+        }
+        if (detail==null  ) {
+            return error("当前月未找到数据");
+        }
+
         return success(detail);
     }
 

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -11,6 +11,7 @@ import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.deduction.domain.BizDeduction;
 import cn.ezhizao.project.business.deduction.service.IBizDeductionService;
+import cn.ezhizao.project.business.reportTaxIsZero.domain.BizFinancialReportTaxDetail;
 import cn.ezhizao.project.business.socialSecurity.domain.*;
 import cn.ezhizao.project.business.socialSecurity.service.IBizSocialSecurityConfirmDetailEmployeeService;
 import cn.ezhizao.project.business.socialSecurity.service.IBizSocialSecurityConfirmDetailService;
@@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -214,6 +216,19 @@ public class SocialSecurityDeclareController extends BaseController {
     public AjaxResult getDetail(@RequestBody BizSocialSecurityDeclareDetail condition) {
         List<BizSocialSecurityDeclareDetail> socialSecurityConfirmDetails = socialSecurityDeclareDetailService.getListByBean(condition);
         BizCompany company = companyService.getById(condition.getCompanyId());
+        int nowYear = LocalDate.now().getYear();
+        int nowMonth = LocalDate.now().getMonthValue();
+        String formattedMonth = String.format("%02d", nowMonth);
+        String year = condition.getYear();
+        String month = condition.getMonth();
+        String s1= year+month;
+        String s2 = nowYear+ formattedMonth;
+//        if(s1.equals(s2) && socialSecurityConfirmDetails .isEmpty()){
+//            return success(new BizSocialSecurityDeclareDetail());
+//        }
+        if(!s1.equals(s2) && socialSecurityConfirmDetails.isEmpty()){
+            return error("当前月未找到数据");
+        }
         if (socialSecurityConfirmDetails.isEmpty()) {
             // 获取上个月的工资人员信息
             // 先获取之前的一个月是否已填报，然后获取填报后的工资人员信息
@@ -229,6 +244,7 @@ public class SocialSecurityDeclareController extends BaseController {
                 condition.setEvidenceFiles(new ArrayList<>());
                 condition.setReportFiles(new ArrayList<>());
             }
+            condition.setCompanyName(company.getName());
             condition.setEmployeePassword(company.getEmployeePassword());
             condition.setGovernmentAccountNo(company.getGovernmentAccountNo());
             condition.setGovernmentPassword(company.getGovernmentPassword());