diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/ContrastListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/ContrastListDTO.java
new file mode 100644
index 000000000..0d8fa7f8b
--- /dev/null
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/ContrastListDTO.java
@@ -0,0 +1,20 @@
+package com.engine.salary.entity.taxdeclaration.dto;
+
+import lombok.Data;
+
+/**
+ * 个税申报表详情列表(劳务报酬所得)
+ *
Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+public class ContrastListDTO {
+ private String local;
+
+ private String online;
+
+ private Object diff;
+}
diff --git a/src/com/engine/salary/entity/taxdeclaration/param/ContrastQueryParam.java b/src/com/engine/salary/entity/taxdeclaration/param/ContrastQueryParam.java
index 95a4861af..e1a24429e 100644
--- a/src/com/engine/salary/entity/taxdeclaration/param/ContrastQueryParam.java
+++ b/src/com/engine/salary/entity/taxdeclaration/param/ContrastQueryParam.java
@@ -19,4 +19,13 @@ public class ContrastQueryParam extends BaseQueryParam {
*/
private Long taxDeclarationId;
+ /**
+ * 是否只显示差异人员
+ */
+ private boolean onlyShowDiffEmp;
+
+ /**
+ * 是否只显示差异项
+ */
+ private boolean onlyShowDiffItem;
}
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
index fb671f6a5..76743eb72 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
@@ -10,6 +10,7 @@ import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
import com.engine.salary.entity.extemp.po.ExtEmpPO;
import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationValueList;
+import com.engine.salary.entity.taxdeclaration.dto.ContrastListDTO;
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationValueListDTO;
import com.engine.salary.entity.taxdeclaration.param.ContrastQueryParam;
import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationValueListQueryParam;
@@ -45,6 +46,7 @@ import weaver.hrm.User;
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -356,8 +358,10 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
onlineNoMap.put(no, map);
}
+ Set onlyShowColumns = new HashSet<>();
List