fix:SQL优化

(cherry picked from commit 4f7ca96131682d1070aeb143c824e0612d6ce5bc)

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/controller/BizFinancialIndividualIncomeTaxController.java

@@ -8,9 +8,12 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.finance.IndividualIncomeTax.domain.BizFinancialIndividualIncomeTax;
 import cn.ezhizao.project.business.finance.IndividualIncomeTax.domain.BizFinancialIndividualIncomeTaxDetail;
+import cn.ezhizao.project.business.finance.IndividualIncomeTax.service.IBizFinancialIndividualIncomeTaxDetailService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTax.service.IBizFinancialIndividualIncomeTaxService;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxDetailIsZero;
 import cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain.BizFinancialIndividualIncomeTaxIsZero;
+import cn.ezhizao.project.business.reportTax.domain.BizFinancialReportTaxDetailNonZero;
+import cn.ezhizao.project.business.reportTax.domain.BizFinancialReportTaxNonZero;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalary;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetail;
 import cn.ezhizao.project.business.salary.domain.BizFinancialSalaryDetailEmployee;
@@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 个税任务Controller
@@ -34,7 +38,8 @@ public class BizFinancialIndividualIncomeTaxController extends BaseController
 {
     @Resource
     private IBizFinancialIndividualIncomeTaxService bizFinancialIndividualIncomeTaxService;
-
+    @Resource
+    private IBizFinancialIndividualIncomeTaxDetailService bizFinancialIndividualIncomeTaxDetailService;
     @Resource
     private IBizFinancialSalaryService bizFinancialSalaryService;
 
@@ -54,10 +59,21 @@ public class BizFinancialIndividualIncomeTaxController extends BaseController
         List<BizFinancialIndividualIncomeTax> list = bizFinancialIndividualIncomeTaxService.getList(bizFinancialIndividualIncomeTax);
 //        //获取个税详情数据
         if(list.size()>0){
-            list.forEach(item->{
-                BizFinancialIndividualIncomeTaxDetail detail=bizFinancialIndividualIncomeTaxService.getTaxDetail(year,month,item.getId());
-                item.setDetail(detail);
+            BizFinancialIndividualIncomeTaxDetail detailConditions = new BizFinancialIndividualIncomeTaxDetail();
+            detailConditions.setMainIds(list.stream().map(BizFinancialIndividualIncomeTax::getId).collect(Collectors.toList()));
+            detailConditions.setYear(year);
+            detailConditions.setMonth(month);
+
+            List<BizFinancialIndividualIncomeTaxDetail> details = bizFinancialIndividualIncomeTaxDetailService.getList(detailConditions);
+            list.forEach(l -> {
+                List<BizFinancialIndividualIncomeTaxDetail> lDetail = details.stream().filter(v -> v.getFinancialIndividualIncomeTaxId().equals(l.getId())).collect(Collectors.toList());
+                l.setDetail(lDetail.isEmpty() ? null : lDetail.get(0));
             });
+
+//            list.forEach(item->{
+//                BizFinancialIndividualIncomeTaxDetail detail=bizFinancialIndividualIncomeTaxService.getTaxDetail(year,month,item.getId());
+//                item.setDetail(detail);
+//            });
         }
         //返回数据
         return getDataTable(list);