From 17afe873563ea26b684805ee4f1249d95c64b2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 5 Sep 2024 18:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/salaryoptconfig.xml                     | 9 +++++++--
 .../entity/taxdeclaration/bo/TaxDeclarationBO.java       | 1 +
 .../entity/taxdeclaration/dto/TaxDeclarationListDTO.java | 4 ++++
 .../entity/taxdeclaration/po/TaxDeclarationPO.java       | 2 ++
 .../salary/service/impl/TaxDeclarationServiceImpl.java   | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml
index 42853e06c..80c777de9 100644
--- a/resource/WEB-INF/salaryoptconfig.xml
+++ b/resource/WEB-INF/salaryoptconfig.xml
@@ -3,6 +3,11 @@
 <config name="н³ê¹ÜÀíȨÏÞ" key="salary">
 
     <module name="Ëãн" key="calculate">
+        <page name="н×ÊÕËÌ×" key="salarySob">
+            <opt name="²éѯ" key="query"/>
+            <opt name="¹ÜÀí" key="admin"/>
+        </page>
+
         <page name="н×ʵµ°¸" key="salaryArchive">
             <opt name="²éѯ" key="query"/>
             <opt name="¹ÜÀí" key="admin"/>
@@ -26,8 +31,8 @@
         </page>
     </module>
 
-    <module name="±¨±í" key="tax">
-        <page name="¸öË°É걨" key="taxdeclaration">
+    <module name="±¨±í" key="report">
+        <page name="±¨±í" key="report">
             <opt name="²éѯ" key="query"/>
             <opt name="¹ÜÀí" key="admin"/>
         </page>
diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
index e9500c680..66aec4865 100644
--- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
@@ -71,6 +71,7 @@ public class TaxDeclarationBO {
                             .operateEmployeeName(employeeNameMap.getOrDefault(taxDeclarationPO.getCreator(), ""))
                             .operateTime(SalaryDateUtil.getFormatLocalDateTime(taxDeclarationPO.getCreateTime()))
                             .description(taxDeclarationPO.getDescription())
+                            .opts(taxDeclarationPO.getOpts())
                             .build();
                 })
                 .collect(Collectors.toList());
diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
index f52ce6a86..5104871b5 100644
--- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java
@@ -13,6 +13,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.Set;
 
 /**
  * 个税申报记录列表
@@ -63,4 +64,7 @@ public class TaxDeclarationListDTO {
 
     @TableTitle(title = "备注", dataIndex = "description", key = "description")
     private String description;
+
+    private Set<String> opts;
+
 }
diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
index 447dff3d1..7a02a14d2 100644
--- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
+++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.Set;
 
 /**
  * 个税申报记录
@@ -91,4 +92,5 @@ public class TaxDeclarationPO {
 
 
     private Collection<Long> taxAgentIds;
+    private Set<String> opts;
 }
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index a0b2f9f18..4c667b730 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -120,7 +120,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);
 
-        taxDeclarationPOS = getAuthService(user).auth(taxDeclarationPOS, AuthFilterTypeEnum.ONLY_DATA, TaxDeclarationPO.class);
+        taxDeclarationPOS = getAuthService(user).auth(taxDeclarationPOS, AuthFilterTypeEnum.DATA_OPT, TaxDeclarationPO.class);
 
         return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
                 taxDeclarationPOS, TaxDeclarationPO.class);