no message

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.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.history.domain.BizHistory;
 import cn.ezhizao.project.business.history.service.IBizHistoryService;
 import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetail;
@@ -23,6 +25,7 @@ import cn.ezhizao.project.business.housingFund.service.IBizHousingFundConfirmDet
 import cn.ezhizao.project.business.housingFund.service.IBizHousingFundConfirmDetailService;
 import cn.ezhizao.project.business.housingFund.service.IBizHousingFundDeclareDetailService;
 import cn.ezhizao.project.business.housingFund.service.IBizHousingFundDeclareService;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityDeclareDetail;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.system.domain.SysFileStorage;
@@ -33,6 +36,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.core.io.ClassPathResource;
@@ -80,7 +84,8 @@ public class BizHousingFundDeclareController extends BaseController {
     IBizDeductionService deductionService;
     @Resource
     IBizWorkOrderRecordService bizWorkOrderRecordService;
-
+    @Resource
+    private IBizEntrustService bizEntrustService;
 
     @Resource
     private IBizHistoryService bizHistoryService;
@@ -299,9 +304,17 @@ public class BizHousingFundDeclareController extends BaseController {
 
             return success(condition);
         }
+        Long id = condition.getHousingFundDeclareId();
+        Long workOrderId = housingFundDeclareService.getById(id).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 ).last("limit 1"));
+        BizHousingFundDeclareDetail bizHousingFundDeclareDetail = housingFundDeclareDetails.get(0);
+        bizHousingFundDeclareDetail.setEntrust(one);
         return success(housingFundDeclareDetails.get(0));
     }
-
     /**
      * 导出列表
      */

src/main/java/cn/ezhizao/project/business/housingFund/domain/BizHousingFundDeclareDetail.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.housingFund.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 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.ApiModelProperty;
@@ -87,4 +88,7 @@ public class BizHousingFundDeclareDetail extends BaseEntity implements Serializa
     private Long verifierId;
     private java.util.Date verifierTime;
     private String refuseReason;
+
+    @TableField(exist = false)
+    private BizEntrust entrust;
 }

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

@@ -15,12 +15,10 @@ import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.history.domain.BizHistory;
 import cn.ezhizao.project.business.history.service.IBizHistoryService;
-import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetail;
-import cn.ezhizao.project.business.housingFund.domain.BizHousingFundConfirmDetailEmployee;
-import cn.ezhizao.project.business.housingFund.domain.vo.EmployeeExcel;
-import cn.ezhizao.project.business.housingFund.domain.vo.HousingFundEmployeeVo;
-import cn.ezhizao.project.business.reportTaxIsZero.domain.BizFinancialReportTaxDetail;
-import cn.ezhizao.project.business.socialSecurity.domain.*;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetail;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityConfirmDetailEmployee;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityDeclare;
+import cn.ezhizao.project.business.socialSecurity.domain.BizSocialSecurityDeclareDetail;
 import cn.ezhizao.project.business.socialSecurity.domain.vo.SocialSecurityDetailVo;
 import cn.ezhizao.project.business.socialSecurity.domain.vo.SocialSecurityEmployeeExcel;
 import cn.ezhizao.project.business.socialSecurity.domain.vo.SocialSecurityEmployeeVo;
@@ -41,7 +39,6 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.catalina.security.SecurityUtil;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,7 +53,10 @@ import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;