no message

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryZeroController.java

@@ -13,6 +13,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
+import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 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 +38,7 @@ import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
+import cn.ezhizao.project.tenant.service.ITenantService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.tomcat.jni.Lock;
@@ -89,6 +92,11 @@ public class BizFinancialSalaryZeroController extends BaseController {
     @Resource
     private IBizFinancialKeepAccountDetailService financialKeepAccountDetailService;
 
+    @Resource
+    private IBizEntrustService bizEntrustService;
+
+    @Resource
+    private ITenantService tenantService;
     /**
      * 查询工资列表
      */
@@ -121,6 +129,18 @@ public class BizFinancialSalaryZeroController extends BaseController {
                     l.setDetails(details.stream().filter(v -> v.getFinancialSalaryId().equals(l.getId())).collect(Collectors.toList()));
                 });
             }
+            list.forEach(l -> {
+                Long workOrderId = l.getWorkOrderId();
+                List<BizEntrust> list1 = bizEntrustService.list(new LambdaQueryWrapper<BizEntrust>()
+                        .eq(BizEntrust::getWorkOrderId, workOrderId)
+                        .eq(BizEntrust::getCurrentMonth, bizFinancialSalary.getYear() + "-" + bizFinancialSalary.getMonth() + "-01"));
+                if (!list1.isEmpty()) {
+                    BizEntrust bizEntrust = list1.get(0);
+                    Long toTenantId = bizEntrust.getToTenantId();
+                    l.setToTenantName(tenantService.getById(toTenantId).getAccountName());
+                }
+
+            });
 
         }
         return getDataTable(list);

src/main/java/cn/ezhizao/project/business/salary/domain/BizFinancialSalary.java

@@ -153,4 +153,8 @@ public class BizFinancialSalary extends BaseEntity {
     private Date verifierTime;
     @TableField(exist = false)
     private List<String> dateFilter;
+
+    @TableField(exist = false)
+    private String toTenantName;
+
 }

src/main/resources/mybatis/business/BizFinancialSalaryMapper.xml

@@ -31,6 +31,10 @@
         left join biz_financial_salary_detail t5 on t5.financial_salary_id = t1.id
                                  and t5.deleted = 0 and t5.month = #{month} and t5.year = #{year} and t5.financial_salary_id = t1.id
         left join sys_user t6 on t6.user_id = t5.verifier_id
+
+
+
+
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t1.is_stop = 0