Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/BB.java

@@ -78,11 +78,13 @@ public class BB extends FunctionBase implements FreeRefFunction {
                         }
                     }
                 }
-                return returnEval;
+                cellValue = returnEval;
+                return cellValue;
             }
             List<CellTemplatePerGroupDto> cellTemplateDataList;
+            Project project = null;
             if (curPeriod.getCurYear() != formulaContext.getYear()) {
-                Project project = agent.getFixedProject(formulaContext.getProjectId(), curPeriod.getCurYear());
+                project = agent.getFixedProject(formulaContext.getProjectId(), curPeriod.getCurYear());
 //                MyAsserts.assertNotNull(project, Exceptions.PROJECT_NOT_FOUND);
                 if(project == null){
                     return cellValue;
@@ -114,9 +116,9 @@ public class BB extends FunctionBase implements FreeRefFunction {
                     formulaContext.getOrganizationId());
             MyAsserts.assertNotEmpty(projectId, Exceptions.PROJECT_EMPTY);
             cellData = agent.getCellData(cellTemplateData.getReportTemplateId(),
-                    cellTemplateData.getCellTemplateId(), curPeriod.getCurPeriod(), formulaContext.getProjectId());
+                    cellTemplateData.getCellTemplateId(), curPeriod.getCurPeriod(), project==null?formulaContext.getProjectId():project.getId());
             List<PeriodDataSource> dss = agent.queryManualDataSource(Long.parseLong(cellTemplateData.getCellTemplateId()),
-                    formulaContext.getProjectId(), bo.getPeriod());
+                    project==null?formulaContext.getProjectId():project.getId(), bo.getPeriod());
             nullCellDto.extractFromGroup(bo, curPeriod, cellData, cellTemplateData);
             if (cellData.getData() == null && !dss.isEmpty()) {
                 cellValue = dss.get(0).getAmount();

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPTYPE.java

@@ -54,10 +54,10 @@ public class WPTYPE extends FunctionBase implements FreeRefFunction {
             cellTemplateDataList = agent.getCellTemplateByTypeAndIndex(formulaContext.getReportTemplateGroupId(),
                     formulaContext.getProjectId(), bo.getReportCode(), bo.getRowColumnIndex() - 1, bo.getTaxRate(), bo.getRevenueType(), bo.getTaxType(), bo.getColumnIndex() - 1,
                     formulaContext.getPeriod(), formulaContext.getOrganizationId(), queryDate, queryDate);
-            if(CollectionUtils.isEmpty(cellTemplateDataList)){
-                cellTemplateDataList = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupId(),
-                        formulaContext.getProjectId(), bo.getReportCode(), ec.getRowIndex(), ec.getColumnIndex(), formulaContext.getPeriod());
-            }
+//            if(CollectionUtils.isEmpty(cellTemplateDataList)){
+//                cellTemplateDataList = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupId(),
+//                        formulaContext.getProjectId(), bo.getReportCode(), ec.getRowIndex(), ec.getColumnIndex(), formulaContext.getPeriod());
+//            }
 //            MyAsserts.assertNotEmpty(cellTemplateDataList, Exceptions.BB_CELL_TEMP_NULL);
             if(CollectionUtils.isEmpty(cellTemplateDataList)){
                 return cellValue;

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml

@@ -146,8 +146,6 @@
         D
         ON
         C.id = D.template_id
-        ORDER BY
-        template_code
     </select>
 
     <select id="getIdsForExceptTemplate" resultType="java.lang.Long">