merge档案管理代码

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/TaxesCalculateReportEnum.java

@@ -10,15 +10,16 @@ public class TaxesCalculateReportEnum {
         Column_1(0, "序号"),
         Column_2(1, "收入类型名称"),
         Column_3(2, "税金项目"),
-        Column_4(3, "账载收入-明细"),
-        Column_5(4, "销项开票收入数-专票"),
-        Column_6(5, "销项开票收入数-普票"),
-        Column_7(6, "计税基数(应税收入）"),
-        Column_8(7, "税率"),
-        Column_9(8, "税额(元)"),
-        Column_10(9, "收入类别"),
-        Column_11(10, "计税方式"),
-        Column_12(11, "备注")
+        Column_4(3, "期间"),
+        Column_5(4, "账载收入-明细"),
+        Column_6(5, "销项开票收入数-专票"),
+        Column_7(6, "销项开票收入数-普票"),
+        Column_8(7, "计税基数(应税收入）"),
+        Column_9(8, "税率"),
+        Column_10(9, "税额(元)"),
+        Column_11(10, "收入类别"),
+        Column_12(11, "计税方式"),
+        Column_13(12, "备注")
         ;
         private Integer index;
         private String name;

atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateController.java

@@ -185,7 +185,7 @@ public class TemplateController extends BaseController {
                                @RequestParam(name = "projectId") String projectId,
                                HttpServletResponse response) throws URISyntaxException {
 
-        period = 0;
+//        period = 0;
         String filePath;
         File templateFile;
         InputStream inputStream = null;

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

@@ -258,7 +258,12 @@ public class TemplateGroupServiceImpl extends AbstractService {
                         cellTemplate.setCreateTime(now);
                         cellTemplate.setUpdateTime(now);
                         cellTemplate.setRowIndex(r);
-                        cellTemplate.setRowName(StringUtils.EMPTY);
+                        //税金计算表单独处理
+                        if("VAT020".equals(template.getCode())){
+                            cellTemplate.setRowName(POIUtil.getCellFormulaString(cell));
+                        }else{
+                            cellTemplate.setRowName(StringUtils.EMPTY);
+                        }
                         cellTemplate.setColumnName(StringUtils.EMPTY);
                         cellTemplate.setComment(StringUtils.EMPTY);
                         cellTemplate.setCopyFromId(0L);
@@ -407,6 +412,10 @@ public class TemplateGroupServiceImpl extends AbstractService {
                             continue;//todo cell == null 如何处理
                         }
                         CellTemplate cellTemplate = new CellTemplate();
+                        //税金计算表单独处理
+                        if("VAT020".equals(template.getCode())){
+                            cellTemplate.setRowName(POIUtil.getCellFormulaString(cell));
+                        }
                         cellTemplate.setColumnIndex(c);
                         cellTemplate.setCreateTime(now);
                         cellTemplate.setUpdateTime(now);

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

@@ -8,18 +8,12 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pwc.taxtech.atms.common.util.MyAsserts;
-import pwc.taxtech.atms.constant.DataSourceName;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
 import pwc.taxtech.atms.dpo.CellTemplatePerGroupDto;
-import pwc.taxtech.atms.dto.vatdto.BBParasBo;
-import pwc.taxtech.atms.dto.vatdto.CurrentPeriodBo;
 import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
 import pwc.taxtech.atms.dto.vatdto.WPNAMEParasBo;
-import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.exception.FormulaException;
-import pwc.taxtech.atms.vat.entity.PeriodCellData;
-import pwc.taxtech.atms.vat.entity.PeriodDataSource;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -65,7 +59,7 @@ public class WPNAME extends FunctionBase implements FreeRefFunction {
             MyAsserts.assertNotEmpty(cellTemplateDataList, Exceptions.BB_CELL_TEMP_NULL);
             cellTemplateData = cellTemplateDataList.get(0);
             int index = ec.getWorkbook().getSheetIndex(bo.getReportCode());
-            cellValue = getCellValue(index, ec, formulaContext, agent, cellTemplateData.getRowIndex(), bo.getColumnIndex() - 1,
+            cellValue = getCellValue(index, ec, formulaContext, agent, cellTemplateData.getRowIndex(), "VAT020".equals(bo.getReportCode())?bo.getColumnIndex():(bo.getColumnIndex() - 1),
                         Long.parseLong(cellTemplateData.getCellTemplateId()));
             nullCellDto.extractFromGroup(bo, formulaContext.getPeriod(), formulaContext.getYear(), cellTemplateData);
             nullCellDto.setAmount(cellValue);

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js

@@ -67,16 +67,16 @@ taxDocumentManageModule.factory('taxDocumentListService',
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/query4SelectionBox', params);
                 },
                 getCompanyNameOptions:function(params){
-                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/org/query4SelectionBox', params);
+                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/org/getMyOrgList', params);
                 },
                 delFileRecordItems:function(params){
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
                 },
                 getDocumentsAttrAndType:function(params){
-                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/v1/fileTypes/selectList', params);
+                    return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/selectList', params);
                 },
                 getBusinessList:function(params){
-                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/v1/businessunit/getlist', params);
+                    return jqFetch.get(apiInterceptor.webApiHostUrl + '/businessunit/getlist', params);
                 },
                 downloadAllFile:function(params){
                     var xhr = new XMLHttpRequest();