新增税金公式

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FormulaAgent.java

@@ -41,6 +41,21 @@ public class FormulaAgent {
         return adminMp.getCellTemplatePerGroupDto(templateGroupId,code,rowIndex,columnIndex,projectId,period);
     }
 
+    /**
+     * 根据列index及row名称查询项目报表模板
+     * @param templateGroupId
+     * @param projectId
+     * @param code
+     * @param rowName
+     * @param columnIndex
+     * @param period
+     * @return
+     */
+    public List<CellTemplatePerGroupDto> getCellTemplateByNameAndIndex(Long templateGroupId, String projectId,String code,Integer rowColumnIndex,String rowName,Integer columnIndex,Integer period) {
+
+
+        return adminMp.getCellTemplateByNameAndIndex(templateGroupId,code,rowColumnIndex,rowName,columnIndex,projectId,period);
+    }
     public Project getFixedProject(String projectId, Integer year) {
         return adminMp.getFixedProject(projectId,year);
     }

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -512,7 +512,7 @@ public class ReportGeneratorImpl {
         FreeRefFunction[] functionImpls = {new SGSR(formulaContext), new FSJZ(formulaContext), new ND(formulaContext),
                 new BB(formulaContext), new XXFP(formulaContext), new GZSD(formulaContext), new PC(formulaContext)
                 , new JXFPMX(formulaContext), new JXFP(formulaContext), new PSUM(formulaContext), new DFFS(formulaContext),
-                new JFFS(formulaContext), new WPSR(formulaContext)};
+                new JFFS(formulaContext), new WPSR(formulaContext),new WPNAME(formulaContext)};
         UDFFinder udfs = new DefaultUDFFinder(functions, functionImpls);
         UDFFinder udfToolpack = new AggregatingUDFFinder(udfs);
         workbook.addToolPack(udfToolpack);

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -48,7 +48,7 @@ public class ReportServiceImpl {
     private final static Logger logger = LoggerFactory.getLogger(ReportServiceImpl.class);
     private BlockingQueue<PeriodJob> queue = new LinkedBlockingQueue<>();
     private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "PC", "JXFPMX",
-            "JXFP", "PSUM", "DFFS", "JFFS", "WPSR"};
+            "JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME"};
 
     @Autowired
     private ReportGeneratorImpl reportGenerator;