no message

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

@@ -11,6 +11,8 @@ 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.entrust.domain.BizEntrust;
+import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTax.domain.BizFinancialIndividualIncomeTaxDetail;
 import cn.ezhizao.project.business.finance.IndividualIncomeTax.service.IBizFinancialIndividualIncomeTaxDetailService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxDetailIsZero;
@@ -29,11 +31,13 @@ import cn.ezhizao.project.business.reportTaxIsZero.domain.BizFinancialReportTax;
 import cn.ezhizao.project.business.reportTaxIsZero.domain.BizFinancialReportTaxDetail;
 import cn.ezhizao.project.business.reportTaxIsZero.service.IBizFinancialReportTaxDetailReportService;
 import cn.ezhizao.project.business.reportTaxIsZero.service.IBizFinancialReportTaxDetailService;
+import cn.ezhizao.project.business.reportTaxIsZero.service.IBizFinancialReportTaxService;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,6 +60,8 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
     @Resource
     IBizFinancialReportTaxNonZeroService financialReportTaxService;
     @Resource
+    IBizFinancialReportTaxService financialReportService;
+    @Resource
     IBizFinancialReportTaxDetailNonZeroService financialReportTaxDetailService;
 
     @Resource
@@ -84,7 +90,8 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
     IBizCompanyService companyService;
     @Resource
     IBizHistoryService bizHistoryService;
-
+    @Resource
+    private IBizEntrustService bizEntrustService;
 
 
     @ApiOperation(value = "查询FinancialReceiveTicket", notes = "根据id查询Channel")
@@ -125,7 +132,14 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
         if (detail==null  ) {
             return error("当前月未找到数据");
         }
-
+        Long fatherId = detail.getFinancialReportTaxId();
+        Long workOrderId = financialReportService.getById(fatherId).getWorkOrderId();
+        String s3 = year +"-"+ month+ "-01";
+        BizEntrust one = bizEntrustService.getOne(new LambdaQueryWrapper<BizEntrust>()
+                .eq(BizEntrust::getWorkOrderId, workOrderId)
+                .eq(BizEntrust::getDeleted, 0)
+                .eq(BizEntrust::getCurrentMonth, s3 ));
+        detail.setEntrust(one);
         return success(detail);
     }
 

src/main/java/cn/ezhizao/project/business/reportTax/domain/BizFinancialReportTaxDetailNonZero.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.reportTax.domain;
 
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
@@ -88,4 +89,7 @@ public class BizFinancialReportTaxDetailNonZero extends BaseEntity {
     @TableField(exist = false)
     private String companyName;
 
+    @TableField(exist = false)
+    private BizEntrust entrust;
+
 }

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

@@ -422,7 +422,7 @@ public class SocialSecurityDeclareController extends BaseController {
         BizEntrust one = bizEntrustService.getOne(new LambdaQueryWrapper<BizEntrust>()
                 .eq(BizEntrust::getWorkOrderId, workOrderId)
                 .eq(BizEntrust::getDeleted, 0)
-                .eq(BizEntrust::getCurrentMonth, s3 ));
+                .eq(BizEntrust::getCurrentMonth, s3 ).last("limit 1"));
         BizSocialSecurityDeclareDetail bizSocialSecurityDeclareDetail = socialSecurityConfirmDetails.get(0);
         bizSocialSecurityDeclareDetail.setEntrust(one);