fix:修改导出sql

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

@@ -203,8 +203,7 @@ public class BizFinancialSalaryController extends BaseController {
 //        List<BizFinancialSalary> list = bizFinancialSalaryService.getList(bizFinancialSalary);
         List<BizFinancialSalary> list = bizFinancialSalaryService.getList2(bizFinancialSalary);
         //优化
-        Map<String, BizFinancialSalaryDetail> detailMap = bizFinancialSalaryDetailService
-                .list(new LambdaQueryWrapper<BizFinancialSalaryDetail>().eq(BizFinancialSalaryDetail::getDeleted, 0))
+        Map<String, BizFinancialSalaryDetail> detailMap = bizFinancialSalaryDetailService.selectBySalaryId(bizFinancialSalary)
                 .stream().collect(Collectors.toMap(d -> d.getFinancialSalaryId() + d.getYear() + d.getMonth(),
                         Function.identity(), (d1, d2) -> d1));
         List<SysUser> sysUsers = sysUserMapper.selectUserList(new SysUser());

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

@@ -533,8 +533,7 @@ public class BizFinancialSalaryZeroController extends BaseController {
 //        List<BizFinancialSalary> list = bizFinancialSalaryService.getList(bizFinancialSalary);
         List<BizFinancialSalary> list = bizFinancialSalaryService.getList2(bizFinancialSalary);
         //优化
-        Map<String, BizFinancialSalaryDetail> detailMap = bizFinancialSalaryDetailService
-                .list(new LambdaQueryWrapper<BizFinancialSalaryDetail>().eq(BizFinancialSalaryDetail::getDeleted, 0))
+        Map<String, BizFinancialSalaryDetail> detailMap = bizFinancialSalaryDetailService.selectBySalaryId(bizFinancialSalary)
                 .stream().collect(Collectors.toMap(d -> d.getFinancialSalaryId() + d.getYear() + d.getMonth(),
                         Function.identity(), (d1, d2) -> d1));
         List<SysUser> sysUsers = sysUserMapper.selectUserList(new SysUser());

src/main/java/cn/ezhizao/project/business/salary/mapper/BizFinancialSalaryDetailMapper.java

@@ -1,6 +1,8 @@
 package cn.ezhizao.project.business.salary.mapper;
 
 import java.util.List;
+
+import cn.ezhizao.project.business.salary.domain.BizFinancialSalary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
 
@@ -26,4 +28,5 @@ public interface BizFinancialSalaryDetailMapper extends BaseMapper<BizFinancialS
      * @return 删除结果
     */
     public int physicalDelete(BizFinancialSalaryDetail bizFinancialSalaryDetail);
+    public List<BizFinancialSalaryDetail> selectBySalaryId(BizFinancialSalary bizFinancialSalary);
 }

src/main/java/cn/ezhizao/project/business/salary/service/IBizFinancialSalaryDetailService.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.salary.service;
 
 import java.util.List;
 
+import cn.ezhizao.project.business.salary.domain.BizFinancialSalary;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
@@ -29,6 +30,6 @@ public interface IBizFinancialSalaryDetailService extends IService<BizFinancialS
      */
     public int physicalDelete(BizFinancialSalaryDetail bizFinancialSalaryDetail);
 
-
+    public List<BizFinancialSalaryDetail> selectBySalaryId(BizFinancialSalary bizFinancialSalary);
     public boolean updateById(BizFinancialSalaryDetail bizFinancialSalaryDetail, Boolean deleteEmployeeFlag);
 }

src/main/java/cn/ezhizao/project/business/salary/service/impl/BizFinancialSalaryDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.salary.service.impl;
 
+import cn.ezhizao.project.business.salary.domain.BizFinancialSalary;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
 import cn.ezhizao.project.business.salary.mapper.BizFinancialSalaryDetailMapper;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -45,7 +47,14 @@ public class BizFinancialSalaryDetailServiceImpl  extends ServiceImpl<BizFinanci
      * @return 删除结果
      */
     @Override
-    public int physicalDelete(BizFinancialSalaryDetail bizFinancialSalaryDetail){ return bizFinancialSalaryDetailMapper.physicalDelete(bizFinancialSalaryDetail); };
+    public int physicalDelete(BizFinancialSalaryDetail bizFinancialSalaryDetail){ return bizFinancialSalaryDetailMapper.physicalDelete(bizFinancialSalaryDetail); }
+
+    @Override
+    public List<BizFinancialSalaryDetail> selectBySalaryId(BizFinancialSalary bizFinancialSalary) {
+        return bizFinancialSalaryDetailMapper.selectBySalaryId(bizFinancialSalary);
+    }
+
+    ;
 
     @Override
     public boolean save(BizFinancialSalaryDetail bizFinancialSalaryDetail) {

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

@@ -8,7 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id column="id" property="id"/>
         <collection property="details" select="getEmployees" column="id" />
     </resultMap>
-
+    <resultMap type="cn.ezhizao.project.business.salary.domain.BizFinancialSalary" id="BizFinancialSalaryResult2">
+        <id column="id" property="id"/>
+        <result column="company_id" jdbcType="BIGINT" property="companyId"/>
+        <!--        <association property="socialCreditCode" select="getSocialCreditCode" column="company_id"></association>-->
+    </resultMap>
 
     <resultMap id="EmployeeResult" type="cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee">
         <id column="id" jdbcType="INTEGER" property="id"/>
@@ -48,4 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <!-- 删除条件为其他外键可以在这里加 -->
         </trim>
     </delete>
+    <select id="selectBySalaryId" resultType="cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail">
+        select * from biz_financial_salary_detail detail
+                          left join biz_financial_salary salary on salary.deleted = 0
+            AND salary.is_stop = 0
+            and detail.financial_salary_id = salary.id
+        where year = #{year} and month = #{month} and detail.deleted = 0
+          AND EXISTS (SELECT 1
+                      FROM biz_entrust eb
+                      WHERE eb.deleted = 0
+                        AND (eb.to_tenant_id = #{tenantId} OR eb.from_tenant_id = #{tenantId})
+                        AND date_format(eb.current_month, '%Y%m') = concat(#{year},#{month})
+                        AND eb.work_order_id = salary.work_order_id);
+    </select>
 </mapper>

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

@@ -179,9 +179,8 @@
                     has_individual_income_tax=#{hasIndividualIncomeTax} and fsd.month = #{month} and fsd.year = #{year})
                 </if>
             </if>
-
-
         </trim>
+        order by t1.create_time desc
     </select>
 
     <delete id="physicalDelete">