#

atms-api/pom.xml

@@ -443,20 +443,30 @@
     <profiles>
         <profile>
             <id>dev</id>
+            <build>
+                <filters>
+                    <filter>src/main/resources/conf/conf_profile_dev.properties</filter>
+                </filters>
+            </build>
+            <properties>
+                <env>dev</env>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>local</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <build>
                 <filters>
-                    <filter>src/main/resources/conf/conf_profile_dev.properties</filter>
+                    <filter>src/main/resources/conf/conf_profile_dev_local.properties</filter>
                 </filters>
             </build>
             <properties>
                 <env>dev</env>
             </properties>
         </profile>
-
-
         <profile>
             <id>staging</id>
             <build>
@@ -617,7 +627,7 @@
                 </dependencies>
             </plugin>
             <!-- See: https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven -->
-            <plugin>
+            <plugin>ll
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
                 <version>3.4.0.905</version>

atms-api/src/main/java/pwc/taxtech/atms/common/ThousandConvert.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -19,11 +20,13 @@ import java.util.Locale;
  * version 1.0
  */
 public class ThousandConvert extends JsonSerializer<BigDecimal> {
-
     @Override
     public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2)
             throws IOException {
-        jgen.writeString(NumberFormat.getIntegerInstance(Locale.getDefault()).format(value));
+        NumberFormat integerInstance = NumberFormat.getIntegerInstance(Locale.getDefault());
+        integerInstance.setMinimumFractionDigits(2);
+        integerInstance.setRoundingMode(RoundingMode.HALF_UP);
+        integerInstance.setGroupingUsed(true);
+        jgen.writeString(integerInstance.format(value));
     }
-
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisActualTaxReturnDto.java

 package pwc.taxtech.atms.dto.analysis;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.ThousandConvert;
+
 import java.math.BigDecimal;
 
 /**
@@ -10,15 +13,19 @@ import java.math.BigDecimal;
 public class AnalysisActualTaxReturnDto {
 
     private String companyName;
+    @JsonSerialize(using = ThousandConvert.class)
 
     private BigDecimal segment1;
+    @JsonSerialize(using = ThousandConvert.class)
 
     private BigDecimal segment2;
+    @JsonSerialize(using = ThousandConvert.class)
 
     private BigDecimal segment3;
+    @JsonSerialize(using = ThousandConvert.class)
 
     private BigDecimal segment4;
-
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal segment5;
 
     public String getCompanyName() {

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisDriverNumDto.java

 package pwc.taxtech.atms.dto.analysis;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.ThousandConvert;
+
 import java.math.BigDecimal;
 
 /**
@@ -11,6 +14,7 @@ public class AnalysisDriverNumDto {
 
     private String driverType;
 
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal driverNum;
 
     public String getDriverType() {

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/EbitDataDto.java

 package pwc.taxtech.atms.dto.vatdto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.ThousandConvert;
+
 import java.math.BigDecimal;
 
 /**
@@ -10,11 +13,16 @@ import java.math.BigDecimal;
  * Version 1.0
  **/
 public class EbitDataDto {
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal ebitSubtraction; // 1.	EBIT（考虑资产减值损失）
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal specialFactors; //考虑特殊因素
     private String  ebitRate;// ebit比率 默认1%（可更改）
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal transactionAmount; //关联交易金额
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal sixAddTax; //6%增值税
+    @JsonSerialize(using = ThousandConvert.class)
     private BigDecimal  totalAmountTax;// 价税合计金额
     private String specialConsiderations;//特殊因素考虑
     public String getSpecialConsiderations() {
@@ -26,8 +34,6 @@ public class EbitDataDto {
     }
 
 
-
-
     public BigDecimal getEbitSubtraction() {
         return ebitSubtraction;
     }

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

@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
+import java.text.NumberFormat;
 import java.util.*;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -1307,6 +1308,7 @@ public class ReportServiceImpl extends BaseService {
         CellDataDto cellDataDto = null;
         CellDataDto cellDataDto1 = null;
         for (int i = 0; i < list.size(); i++) {
+            if(i >=23) continue;//过滤掉多余数据
             cellDataDto = new CellDataDto();
             cellDataDto1 = new CellDataDto();
             if (list.get(i).getItemName().equals(""))
@@ -2517,38 +2519,6 @@ public class ReportServiceImpl extends BaseService {
     }
 
 
-    @Transactional
-    public void saveDatasource(String orgId, Integer period, Integer specialConsiderations, String ebitRate,
-                               OperationResultDto<ReportDataDto> operationResultDto,
-                               List<CellDataDto> cellDataList) {
-        EbitCellDataExample example = null;
-
-        List<EbitCellData> ebitCellDataList = new ArrayList<>();
-        for (int i = 37; i <= 43; i++) {
-            example = new EbitCellDataExample();
-            EbitCellDataExample.Criteria criteria = example.createCriteria();
-            criteria.andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period).andColEqualTo(1).andRowEqualTo(i);
-            List<EbitCellData> ebitCellData = ebitCellDataMapper.selectByExample(example);
-            if (ebitCellData.size() == 0) {
-                for (CellDataDto cellDataDto : cellDataList) {
-                    EbitCellData ebitCellData1 = new EbitCellData();
-                    ebitCellData1.setId(idService.nextId());
-                    ebitCellData1.setOrganizationId(orgId);
-                    ebitCellData1.setPeriod(period);
-                    ebitCellData1.setCreateTime(new Date());
-                    ebitCellData1.setCol(cellDataDto.getColumnIndex());
-                    ebitCellData1.setRow(cellDataDto.getRowIndex());
-                    ebitCellData1.setData(cellDataDto.getCellValue());
-                    ebitCellDataList.add(ebitCellData1);
-                }
-                ebitCellDataList.add(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period));
-                ebitCellDataMapper.insertBatch(ebitCellDataList);
-            } else {
-                ebitCellDataMapper.updateByExampleSelective(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period), example);
-            }
-        }
-    }
-
     private EbitCellData switchMeth(Integer i, EbitCellData ebitCellData1, OperationResultDto<ReportDataDto> operationResultDto, Integer specialConsiderations, String ebitRate, String orgId, Integer period) {
         switch (i) {
             case 37:
@@ -2668,6 +2638,7 @@ public class ReportServiceImpl extends BaseService {
     @Autowired
     private JdbcTemplate jdbcTemplate;
     private CellStyle cellStyle1 = null;
+    private static final String EBITTemplateCode = "VAT10086";
 
     /**
      * 批量导出Excel ebit利润表
@@ -2682,7 +2653,7 @@ public class ReportServiceImpl extends BaseService {
         File templateFile;
         InputStream inputStream = null;
         TemplateExample templateExample = new TemplateExample();
-        templateExample.createCriteria().andCodeEqualTo("VAT10086").andNameEqualTo("VAT10086");//todo 这里是利润表模板的固定code，禁止重复
+        templateExample.createCriteria().andCodeEqualTo(EBITTemplateCode).andNameEqualTo(EBITTemplateCode);//todo 这里是利润表模板的固定code，禁止重复
         List<Template> templates1 = templateMapper.selectByExample(templateExample);
         if (templates1.size() == 0)
             throw new Exception("没有利润表模板,无法批量导出,请上传模板");
@@ -2882,7 +2853,9 @@ public class ReportServiceImpl extends BaseService {
         sheetAt.getRow(row).getCell(col).setCellStyle(cellStyle1);
         return sheetAt.getRow(row).getCell(col);
     }
+
     private static final String headerEbitTitle = "汇总利润表";
+
     public void insertExcelOne(CellStyle headerCellType, XSSFWorkbook workbook1, Sheet sheetAt, Integer _index, RequestParameterDto requestParameterDto) {
         headerCellType.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直
         headerCellType.setAlignment(HorizontalAlignment.CENTER);// 水平
@@ -2946,7 +2919,7 @@ public class ReportServiceImpl extends BaseService {
     //获取利润表模板Id 利润表固定模板VAT10086
     public String getlxbId() throws Exception {
         try {
-            String sql = "select * from template t where t.name  = 'VAT10086' order by t.create_time desc ";
+            String sql = "select * from template t where t.name  = '" + EBITTemplateCode + "' order by t.create_time desc ";
             Map<String, Object> stringObjectMap = new HashMap<>();
             stringObjectMap = jdbcTemplate.queryForList(sql).get(0);
             return stringObjectMap.get("id").toString();

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisActualTaxReturn.java

@@ -3,6 +3,8 @@ package pwc.taxtech.atms.analysis.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import pwc.taxtech.atms.entity.BaseEntity;
 
 /**