fix冲突

# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctConsolidatedTaxBO.java

@@ -1,5 +1,6 @@
 package com.engine.salary.entity.salaryacct.bo;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.salary.constant.TaxDeclarationDataIndexConstant;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
@@ -73,6 +74,9 @@ public class SalaryAcctConsolidatedTaxBO {
                     .filter(e -> Objects.equals(e.getSalaryItemId(), optional.get()))
                     .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
+            if (StrUtil.isBlank(resultValue)) {
+                resultValue = "0.00";
+            }
             return new BigDecimal(resultValue).add(income).toPlainString();
         }
         // 个税调差为0
@@ -98,6 +102,9 @@ public class SalaryAcctConsolidatedTaxBO {
                         .map(e -> SalaryEntityUtil.empty2Zero(e.getResultValue()))
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
             }
+            if (StrUtil.isBlank(resultValue)) {
+                resultValue = "0.00";
+            }
             return new BigDecimal(resultValue).add(refundedOrSupplementedTax).subtract(taxAdjustment).toPlainString();
         }
         return resultValue;

src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java

@@ -20,7 +20,7 @@ import java.util.Collection;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SalaryAcctCalculateParam {
+public class SalaryAcctCalculateParam  {
 
    //核算人员的id,不是employeeId而是salaryAcctEmpId
     private Collection<Long> ids;

src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java

@@ -38,6 +38,10 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "薪资类型", dataIndex = "incomeCategory", key = "incomeCategory")
     private String incomeCategory;
 
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
+    private Date taxCycle;
+
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @TableTitle(title = "薪资所属月", dataIndex = "salaryMonth", key = "salaryMonth")
     private Date salaryMonth;
@@ -48,10 +52,6 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
     private String taxAgentName;
 
-    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
-    private Date taxCycle;
-
     //@TableTitle(title = "操作人id", dataIndex = "operateEmployeeId", key = "operateEmployeeId")
     private Long operateEmployeeId;
 

src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java

@@ -7,6 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+
 import java.util.Date;
 
 /**

src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java

@@ -104,6 +104,13 @@ public class TaxDeclarationPO {
     LocalDateRange salaryMonths;
 
 
+    //"开始日期
+    private Date taxCycleFromDate;
+
+    //结束日期
+    private Date taxCycleEndDate;
+
+
     /**
      * 税款所属期
      */

src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java

@@ -711,7 +711,7 @@ public enum IncomeCategoryEnum implements BaseEnum<Integer> {
         }
         List<GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb> rysbsblb = feedbackResponse.getBody().getRysbsblb();
         if (CollectionUtil.isNotEmpty(rysbsblb)) {
-            String err = rysbsblb.stream().map(GetASynIndividualIncomeTaxFeedbackResponse.Body.rysbsb::getSbyy).collect(Collectors.joining(";"));
+            String err = rysbsblb.stream().map(sb -> Util.null2String(sb.getXm()) + Util.null2String(sb.getSbyy())).collect(Collectors.joining(";"));
             throw new OnlineCalculateTaxException(err);
         }
     }

src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml

@@ -69,6 +69,12 @@
         <if test="taxMonths != null and taxMonths.endDate != null">
             AND tax_cycle <![CDATA[ <= ]]> #{taxMonths.endDate}
         </if>
+        <if test="taxCycleFromDate != null">
+            AND tax_cycle <![CDATA[ >= ]]> #{taxCycleFromDate}
+        </if>
+        <if test="taxCycleEndDate != null">
+            AND tax_cycle <![CDATA[ <= ]]> #{taxCycleEndDate}
+        </if>
         <if test="taxAgentIds != null and taxAgentIds.size()>0">
             AND tax_agent_id IN
             <foreach collection="taxAgentIds" open="(" item="id" separator="," close=")">

src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java

@@ -9,18 +9,29 @@ import com.engine.salary.biz.SalarySobItemGroupBiz;
 import com.engine.salary.biz.SalarySobItemHideBiz;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
+import com.engine.salary.entity.datacollection.AddUpDeduction;
+import com.engine.salary.entity.datacollection.AddUpSituation;
+import com.engine.salary.entity.datacollection.DataCollectionEmployee;
+import com.engine.salary.entity.datacollection.dto.AttendQuoteDataDTO;
+import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
+import com.engine.salary.entity.datacollection.po.OtherDeductionPO;
+import com.engine.salary.entity.datacollection.po.VariableItemPO;
+import com.engine.salary.entity.salaryacct.bo.CalculateFormulaVarBO;
+import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculateBO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculatePriorityBO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctConfig;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
+import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
-import com.engine.salary.entity.salaryarchive.config.ArchiveFieldConfig;
+import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
 import com.engine.salary.entity.salaryformula.ExpressFormula;
-import com.engine.salary.entity.salaryformula.po.FormulaVar;
 import com.engine.salary.entity.salaryformula.config.FormluaConfig;
 import com.engine.salary.entity.salaryformula.po.FormulaPO;
 import com.engine.salary.entity.salaryformula.po.FormulaVar;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.salarysob.bo.SalarySobItemAggregateBO;
 import com.engine.salary.entity.salarysob.dto.SalaryItemTopologyDTO;
+import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
 import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO;
 import com.engine.salary.entity.salarysob.dto.SalarySobItemFormDTO;
 import com.engine.salary.entity.salarysob.param.SalaryItemTopologyQueryParam;
@@ -46,11 +57,13 @@ import com.engine.salary.util.valid.ValidUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import weaver.general.BaseBean;
 import weaver.hrm.User;
 
+import java.time.Month;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -121,6 +134,59 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
     }
 //    private LoggerTemplate salarySobLoggerTemplate;
 
+    private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
+        return ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user);
+    }
+
+    private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
+        return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
+    }
+
+    private SalarySobService getSalarySobService(User user) {
+        return ServiceUtil.getService(SalarySobServiceImpl.class, user);
+    }
+
+    private SIAccountService getSIAccountService(User user) {
+        return ServiceUtil.getService(SIAccountServiceImpl.class, user);
+    }
+
+    private AttendQuoteFieldService getAttendQuoteFieldService(User user) {
+        return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user);
+    }
+
+    private VariableItemService getVariableItemService(User user) {
+        return ServiceUtil.getService(VariableItemServiceImpl.class, user);
+    }
+
+    private SalaryEmployeeService getSalaryEmployeeService(User user) {
+        return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
+    }
+
+    private SalaryArchiveService getSalaryArchiveService(User user) {
+        return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user);
+    }
+
+    private AddUpSituationService getAddUpSituationService(User user) {
+        return ServiceUtil.getService(AddUpSituationServiceImpl.class, user);
+    }
+
+    private AddUpDeductionService getAddUpDeductionService(User user) {
+        return ServiceUtil.getService(AddUpDeductionServiceImpl.class, user);
+    }
+
+    private OtherDeductionService getOtherDeductionService(User user) {
+        return ServiceUtil.getService(OtherDeductionServiceImpl.class, user);
+    }
+
+    private AttendQuoteDataService getAttendQuoteDataService(User user) {
+        return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user);
+    }
+
+    private VariableArchiveService getVariableArchiveService(User user) {
+        return ServiceUtil.getService(VariableArchiveServiceImpl.class, user);
+    }
+
+
     @Override
     public List<SalarySobItemPO> list() {
         return salarySobItemMapper.listAll();
@@ -623,7 +689,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
                     }
                     salarySobItemPO.setFormula(formulaPO);
                 }
-                if(SalaryEntityUtil.isNotNullOrEmpty(salarySobItemPO.getSalaryItemId())){
+                if (SalaryEntityUtil.isNotNullOrEmpty(salarySobItemPO.getSalaryItemId())) {
                     SalaryItemPO salaryItemPO = itemIdMap.get(salarySobItemPO.getSalaryItemId());
                     salarySobItemPO.setSalaryItem(salaryItemPO);
                 }
@@ -671,7 +737,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
             salarySobItemFormDTO
                     .setId(salarySobItemPO.getId())
                     .setName(salaryItemPO.getName())
-                    .setItemHide(salarySobItemPO.getItemHide()==null?0:Integer.parseInt(salarySobItemPO.getItemHide().toString()))
+                    .setItemHide(salarySobItemPO.getItemHide() == null ? 0 : Integer.parseInt(salarySobItemPO.getItemHide().toString()))
                     .setDataType(salaryItemPO.getDataType())
                     .setRoundingMode(salarySobItemPO.getRoundingMode() == null ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode())
                     .setPattern(salarySobItemPO.getPattern() == null ? salaryItemPO.getPattern() : salarySobItemPO.getPattern())
@@ -720,7 +786,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         salaryItemTopologyDTO.setSalaryItemId(salaryItemPO.getId());
         salaryItemTopologyDTO.setSalaryItemName(salaryItemPO.getName());
         salaryItemTopologyDTO.setFormula(expressFormula);
-        salaryItemTopologyDTO.setResult(topologyData.getResultItemMap().getOrDefault(salaryItemPO.getId(), ""));
+        salaryItemTopologyDTO.setResult(topologyData.getResultItemMap().getOrDefault(SalaryFormulaReferenceEnum.SALARY_ITEM.getValue() + "_" + salaryItemPO.getCode(), ""));
 
         topology(salaryItemTopologyDTO, topologyData);
 
@@ -761,7 +827,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
                 for (int i = 0; i < parameters.size(); i++) {
                     FormulaVar formulaVar = parameters.get(i);
                     String source = formulaVar.getSource();
-                    String fieldId = formulaVar.getFieldId().replace(source + "_", "");
+                    String fieldId = formulaVar.getFieldId();
+                    String code = fieldId.replace(source + "_", "");
                     String name = formulaVar.getName();
                     String fieldName = formulaVar.getFieldName();
                     //是否是薪资项目
@@ -779,26 +846,26 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
                     }
 
                     ExpressFormula expressFormula;
-                    if (salarySobItemCodeMap.containsKey(fieldId)) {
+                    if (salarySobItemCodeMap.containsKey(code)) {
                         // 如果薪资账套下重新定义了薪资项目的公式，则使用薪资账套下的公式，否则使用薪资项目本身的公式
-                        expressFormula = expressFormulaIdMap.get(salarySobItemCodeMap.get(fieldId).getFormulaId());
-                    } else if (salaryItemCodeMap.containsKey(fieldId)) {
-                        expressFormula = expressFormulaIdMap.get(salaryItemCodeMap.get(fieldId).getFormulaId());
+                        expressFormula = expressFormulaIdMap.get(salarySobItemCodeMap.get(code).getFormulaId());
+                    } else if (salaryItemCodeMap.containsKey(code)) {
+                        expressFormula = expressFormulaIdMap.get(salaryItemCodeMap.get(code).getFormulaId());
                     } else {
                         expressFormula = null;
                     }
 
-                    SalaryItemPO salaryItemChild = isSalaryItemVar ? salaryItemCodeMap.get(fieldId) : new SalaryItemPO();
+                    SalaryItemPO salaryItemChild = isSalaryItemVar ? salaryItemCodeMap.get(code) : new SalaryItemPO();
 
                     SalaryItemTopologyDTO salaryItemTopologyChild = new SalaryItemTopologyDTO();
                     salaryItemTopologyChild.setSalaryItemId(isSalaryItemVar ? salaryItemChild.getId() : null);
                     salaryItemTopologyChild.setSalaryItemName(isSalaryItemVar ? salaryItemChild.getName() : fieldName);
                     salaryItemTopologyChild.setFormula(expressFormula);
-                    salaryItemTopologyChild.setResult(isSalaryItemVar ? topologyData.getResultItemMap().getOrDefault(salaryItemChild.getId(), "") : "");
+                    salaryItemTopologyChild.setResult(topologyData.getResultItemMap().getOrDefault(fieldId, ""));
                     salaryItemTopologyDTOChildren.add(salaryItemTopologyChild);
 
                     if (isSalaryItemVar) {
-                        SalaryItemPO salaryItemChildChild = salaryItemCodeMap.get(fieldId);
+                        SalaryItemPO salaryItemChildChild = salaryItemCodeMap.get(code);
                         SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(salaryItemChildChild.getValueType());
                         if (salaryValueTypeEnum != SalaryValueTypeEnum.INPUT) {
                             topologyData.setSalaryItemId(salaryItemChildChild.getId());
@@ -843,9 +910,119 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         //薪资结果
         Long acctEmpId = param.getAcctEmpId();
         if (acctEmpId != null) {
-            List<SalaryAcctResultPO> results = getSalaryAcctResultService(user).listBySalaryAcctEmployeeId(acctEmpId);
-            Map<Long, String> resultItemMap = SalaryEntityUtil.convert2Map(results, SalaryAcctResultPO::getSalaryItemId, SalaryAcctResultPO::getResultValue);
-            topologyData.setResultItemMap(resultItemMap);
+            SalaryAcctEmployeePO acctEmployeePO = getSalaryAcctEmployeeService(user).getById(acctEmpId);
+            List<SalaryAcctEmployeePO> acctEmployeePOS = new ArrayList<>();
+            acctEmployeePOS.add(acctEmployeePO);
+
+            Long salaryAcctRecordId = acctEmployeePO.getSalaryAcctRecordId();
+
+            // 1、查询薪资核算记录
+            SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId);
+            if (Objects.isNull(salaryAcctRecordPO)) {
+                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
+            }
+            //查询对应账套
+            SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId());
+            if (Objects.isNull(salarySobPO)) {
+                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资账套不存在或已被删除"));
+            }
+
+            // 不是查询薪资账套下实时的薪资项目，而是查询发起薪资核算时存储的薪资项目快照
+            SalaryAcctConfig salaryAcctSobConfig = getSalaryAcctSobConfigService(user).getSalaryAcctConfig(salaryAcctRecordId);
+
+            // 2、查询薪资核算记录的薪资周期、考勤周期等
+            SalarySobCycleDTO salarySobCycleDTO = getSalaryAcctRecordService(user).getSalarySobCycleById(salaryAcctRecordId);
+            // 3、查询薪资核算记录所用薪资账套的薪资项目副本
+            List<SalarySobItemPO> salarySobItemPOS = salaryAcctSobConfig.getSalarySobItems();
+            // 回算薪资项目
+            List<SalarySobBackItemPO> salarySobBackItems = Collections.emptyList();
+            if (Objects.equals(salaryAcctRecordPO.getBackCalcStatus(), 1)) {
+                salarySobBackItems = salaryAcctSobConfig.getSalarySobBackItems();
+            }
+            // 4、查询当前租户的所有薪资项目
+            List<SalaryItemPO> salaryItemPOS = getSalaryItemService(user).listAll();
+            // 6、查询社保福利的所有字段
+            Map<String, String> welfareColumns = getSIAccountService(user).welfareColumns();
+            // 7、查询考勤引用的所有字段
+            List<AttendQuoteFieldListDTO> attendQuoteFieldListDTOS = getAttendQuoteFieldService(user).listAll();
+            List<VariableItemPO> variableItemPOS = getVariableItemService(user).listAll();
+
+            // 8、查询公式详情
+            Set<Long> formulaIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getFormulaId);
+            formulaIds.addAll(SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getFormulaId));
+            formulaIds.addAll(SalaryEntityUtil.properties(salarySobBackItems, SalarySobBackItemPO::getFormulaId));
+            List<ExpressFormula> formulas = getSalaryFormulaService(user).listExpressFormula(formulaIds);
+            // 本次运算的回算薪资项目所涉及的变量
+//            Set<String> issuedFieldIds = getIssuedFieldIds(salarySobBackItems);
+
+            // 10、根据id查询其他合并计税的薪资核算记录
+            List<SalaryAcctRecordPO> otherSalaryAcctRecordPOS = getSalaryAcctRecordService(user).listById4OtherConsolidatedTax(salaryAcctRecordPO.getId());
+
+            // 12.3、生成本次运算的key
+            String calculateKey = UUID.randomUUID().toString();
+            // 12.5、多线程运算，运算结果存放在临时表中
+            SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO()
+                    .setSalaryAcctRecordPO(salaryAcctRecordPO)
+                    .setSalarySobPO(salarySobPO)
+                    .setSalarySobCycleDTO(salarySobCycleDTO)
+                    .setOtherSalaryAcctRecordPOS(otherSalaryAcctRecordPOS)
+                    .setSalarySobItemPOS(salarySobItemPOS)
+                    .setSalaryItemIdWithPriorityList(new ArrayList<>())
+                    .setExpressFormulas(formulas)
+                    .setSalaryItemPOS(salaryItemPOS)
+                    .setSalarySobAdjustRulePOS(new ArrayList<>())
+                    .setWelfareColumns(MapUtils.emptyIfNull(welfareColumns))
+                    .setAttendQuoteFieldListDTOS(attendQuoteFieldListDTOS)
+                    .setSalaryAcctEmployeePOS(acctEmployeePOS)
+                    .setIssuedFieldIds(new HashSet<>())
+                    .setResults(null)
+                    .setCalculateKey(calculateKey)
+                    .setVariableItems(variableItemPOS)
+                    .setTaxDeclarationFunction(null)
+                    .setTaxIds(null);
+
+
+            List<Long> employeeIds = Collections.singletonList(acctEmployeePO.getEmployeeId());
+            List<DataCollectionEmployee> simpleEmployees = getSalaryEmployeeService(user).getEmployeeByIdsAll(employeeIds);
+            Long taxAgentId = salaryAcctCalculateBO.getSalarySobPO().getTaxAgentId();
+            List<SalaryArchiveDataDTO> salaryArchiveData = getSalaryArchiveService(user).getSalaryArchiveData(salarySobCycleDTO.getSalaryCycle(), employeeIds, taxAgentId);
+            List<AddUpSituation> addUpSituationPOS;
+            if (salarySobCycleDTO.getTaxCycle().getMonth() == Month.JANUARY) {
+                // 3.1、如果当前税款所属期是本年度第一个税款所属期，就不需要查询往期累计情况
+                addUpSituationPOS = Collections.emptyList();
+            } else {
+                addUpSituationPOS = getAddUpSituationService(user).getAddUpSituationList(salarySobCycleDTO.getTaxCycle().plusMonths(-1), employeeIds);
+            }
+            List<AddUpDeduction> addUpDeductionPOS = getAddUpDeductionService(user).getAddUpDeductionList(salarySobCycleDTO.getTaxCycle(), employeeIds, taxAgentId);
+            List<OtherDeductionPO> otherDeductionPOS = getOtherDeductionService(user).getOtherDeductionList(salarySobCycleDTO.getTaxCycle(), employeeIds, taxAgentId);
+            List<Map<String, Object>> welfareData = new ArrayList<>();
+            welfareData.addAll(getSIAccountService(user).welfareData(salarySobCycleDTO.getSocialSecurityCycle().toString(), employeeIds, taxAgentId));
+            List<AttendQuoteDataDTO> attendQuoteDataDTOS = getAttendQuoteDataService(user).getAttendQuoteData(salarySobCycleDTO.getSalaryMonth(), salarySobCycleDTO.getSalarySobId(), employeeIds);
+            List<Long> salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getSalaryAcctEmployeePOS(), SalaryAcctEmployeePO::getId, Collectors.toList());
+            List<SalaryAcctResultPO> salaryAcctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctEmployeeIds(salaryAcctEmployeeIds);
+            Map<String, String> empItemValueMap = SalaryEntityUtil.convert2Map(salaryAcctResultPOS, p -> p.getSalaryAcctEmpId() + "_" + p.getSalaryItemId(), SalaryAcctResultPO::getResultValue);
+            List<Map<String, Object>> variableArchiveList = getVariableArchiveService(user).listBySalaryMonthAndEmployeeIds(salarySobCycleDTO.getSalaryMonth(), employeeIds, taxAgentId);
+            Map<String, List<SalaryAcctResultPO>> collect = salaryAcctResultPOS.stream().collect(Collectors.groupingBy(k -> k.getEmployeeId() + "-" + k.getTaxAgentId() + "-" + k.getSalaryItemId()));
+            Map<String, String> salaryAcctResultPOMap = new HashMap<>();
+            for (Map.Entry<String, List<SalaryAcctResultPO>> et : collect.entrySet()) {
+                salaryAcctResultPOMap.put(et.getKey(), et.getValue().get(0).getOriginResultValue());
+            }
+            Set<Long> otherSalaryAcctRecordIds = SalaryEntityUtil.properties(salaryAcctCalculateBO.getOtherSalaryAcctRecordPOS(), SalaryAcctRecordPO::getId);
+            List<SalaryAcctResultPO> otherSalaryAcctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctRecordIdsAndEmployeeIds(otherSalaryAcctRecordIds, employeeIds);
+            Map<String, List<SalaryAcctResultPO>> otherSalaryAcctResultPOMap = SalaryEntityUtil.group2Map(otherSalaryAcctResultPOS, e -> e.getEmployeeId() + "_" + e.getTaxAgentId());
+            List<SalaryAcctEmployeePO> otherSalaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIdsAndEmployeeIds(otherSalaryAcctRecordIds, employeeIds);
+            Map<String, List<SalaryAcctEmployeePO>> otherSalaryAcctEmployeePOMap = SalaryEntityUtil.group2Map(otherSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId());
+//            List<SalaryAcctResultPO> lastMonthResultPOS = getSalaryAcctResultService(user).listBySobSalaryMonth(SalaryDateUtil.toDate(salarySobCycleDTO.getSalaryMonth().minusMonths(1), 1), salaryAcctCalculateBO.getSalarySobPO().getId(), employeeIds);
+            CalculateFormulaVarBO calculateFormulaVarBO = new CalculateFormulaVarBO(simpleEmployees, salaryArchiveData, addUpSituationPOS, addUpDeductionPOS, otherDeductionPOS, welfareData, attendQuoteDataDTOS, salaryAcctResultPOS, variableArchiveList);
+            Map<String, List<CalculateFormulaVarBO.FormulaVarValue>> formulaVarMap = calculateFormulaVarBO.convert2FormulaVar(salaryAcctCalculateBO);
+
+            Map<String, String> resultMap = new HashMap<>();
+            formulaVarMap.entrySet().forEach(e -> {
+                e.getValue().forEach(f -> {
+                    resultMap.put(f.getFieldId(), f.getFieldValue());
+                });
+            });
+            topologyData.setResultItemMap(resultMap);
         } else {
             topologyData.setResultItemMap(new HashMap<>());
         }
@@ -879,7 +1056,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         /**
          * 核算结果
          */
-        Map<Long, String> resultItemMap;
+        Map<String, String> resultItemMap;
     }
 
 

src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -157,20 +158,24 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
     public PageInfo<TaxDeclarationPO> listPageByParam(TaxDeclarationListQueryParam queryParam) {
         // 分页参数
         TaxDeclarationPO po = TaxDeclarationPO.builder().build();
-        LocalDateRange localDateRange = new LocalDateRange();
         if (Objects.nonNull(queryParam.getFromSalaryMonth())) {
-            localDateRange.setFromDate(queryParam.getFromSalaryMonth());
+            po.setTaxCycleFromDate(queryParam.getFromSalaryMonth());
         }
         if (Objects.nonNull(queryParam.getEndSalaryMonth())) {
-            localDateRange.setEndDate(SalaryDateUtil.localDateToDate(SalaryDateUtil.localDate2YearMonth(queryParam.getEndSalaryMonth()).atEndOfMonth()));
+            po.setTaxCycleEndDate(queryParam.getEndSalaryMonth());
         }
-        po.setSalaryMonths(localDateRange);
 
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
-
         taxDeclarationPOS = getAuthService(user).auth(taxDeclarationPOS, AuthFilterTypeEnum.DATA_OPT, TaxDeclarationPO.class);
 
+        if (StrUtil.isNotBlank(queryParam.getTaxAgentName())) {
+            List<TaxAgentPO> taxAgentPOs = getTaxAgentService(user).list(TaxAgentQueryParam.builder().name(queryParam.getTaxAgentName()).build());
+            Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOs, TaxAgentPO::getId);
+            taxDeclarationPOS = taxDeclarationPOS.stream().filter(tax -> taxAgentIds.contains(tax.getTaxAgentId())).collect(Collectors.toList());
+        }
+
+
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 taxDeclarationPOS, TaxDeclarationPO.class);
 

src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
@@ -23,6 +24,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobAddUpRulePO;
 import com.engine.salary.entity.salarysob.po.SalarySobPO;
 import com.engine.salary.entity.salarysob.po.SalarySobTaxReportRulePO;
 import com.engine.salary.entity.taxagent.bo.TaxAgentTaxReturnBO;
+import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.entity.taxagent.po.TaxAgentTaxReturnPO;
 import com.engine.salary.entity.taxapiflow.bo.TaxApiFlowBO;
@@ -250,6 +252,13 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         }
 
         List<TaxDeclareRecordPO> taxDeclareRecordPOS = getTaxDeclareRecordMapper().listSome(build);
+
+        if (StrUtil.isNotBlank(queryParam.getTaxAgentName())) {
+            List<TaxAgentPO> taxAgentPOs = getTaxAgentService(user).list(TaxAgentQueryParam.builder().name(queryParam.getTaxAgentName()).build());
+            Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOs, TaxAgentPO::getId);
+            taxDeclareRecordPOS = taxDeclareRecordPOS.stream().filter(tax -> taxAgentIds.contains(tax.getTaxAgentId())).collect(Collectors.toList());
+        }
+
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), taxDeclareRecordPOS, TaxDeclareRecordPO.class);
     }
 

src/com/engine/salary/web/TaxDeclarationController.java

@@ -72,7 +72,7 @@ public class TaxDeclarationController {
     @POST
     @Path("/list")
     @Produces(MediaType.APPLICATION_JSON)
-    public String listTaxDeclaration(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam) {
+    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<TaxDeclarationListQueryParam, PageInfo>(user).run(getTaxDeclareRecordWrapper(user)::listPage, queryParam);
     }