申报表权限规则

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>

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());

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;
+
 }

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;
 }

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);