fix bug

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

@@ -57,7 +57,6 @@ 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;
@@ -375,8 +374,10 @@ public class ReportServiceImpl extends BaseService {
                 destRecord.setRevenueCofId(map.get(mapping.getContent()));
                 InvoiceRecordExample recordExample = new InvoiceRecordExample();
                 recordExample.createCriteria().andProjectIdEqualTo(projectId)
-                        .andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent()).
-                        andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
+                        .andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent())
+                        .andTaxRateEqualTo(mapping.getTaxRate())
+                        .andDepartmentEqualTo(mapping.getOuName())
+                        .andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
                 invoiceRecordMapper.updateByExampleSelective(destRecord, recordExample);
             }
         }
@@ -877,8 +878,8 @@ public class ReportServiceImpl extends BaseService {
                     row.getCell(TaxesCalculateReportEnum.Column.Column_4.getIndex()).setCellValue(0.00);
                 } else if (1 == config.getAccountType()) {//科目
                     row.getCell(TaxesCalculateReportEnum.Column.Column_4.getIndex()).setCellValue(
-                            "DFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,\"" + config.getTbSegment5() + "\",\"" + config.getTbSegment6() + "\")-"
-                                    + "JFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,\"" + config.getTbSegment5() + "\",\"" + config.getTbSegment6() + "\")");
+                            "DFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",3,\"" + config.getTbSegment5() + "\",\"" + config.getTbSegment6() + "\")-"
+                                    + "JFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",3,\"" + config.getTbSegment5() + "\",\"" + config.getTbSegment6() + "\")");
                 } else if (2 == config.getAccountType()) {//手工输入
 
                 } else {
@@ -896,9 +897,9 @@ public class ReportServiceImpl extends BaseService {
                 } else if (3 == config.getTaxBase()) {//手工录入
 
                 } else if (4 == config.getTaxBase()) {//借方发生额
-                    row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getBaseDrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
+                    row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getBaseDrCode() + "\"," + project.getYear() + "," + period + ",3,,)");
                 } else if (5 == config.getTaxBase()) {//贷方发生额
-                    row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getBaseCrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
+                    row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getBaseCrCode() + "\"," + project.getYear() + "," + period + ",3,,)");
                 } else {
                     row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("");
                 }
@@ -934,7 +935,7 @@ public class ReportServiceImpl extends BaseService {
                 sumStr += cellNum + ",";
             }
             sumStr += "\")";
-            sumStr = sumStr.replace(",\")", "\")");
+//            sumStr = sumStr.replace(",\")", "\")");
 
             sumRow.getCell(entry.getKey()).setCellValue(sumStr);
         }
@@ -2091,16 +2092,17 @@ public class ReportServiceImpl extends BaseService {
             PeriodDataSource dataSourceModel = null;
             if (dataSourceExtendDtos.size() > 0) {
                 dataSourceModel = dataSourceExtendDtos.get(0).getDataSource();
+                dataSourceModel= periodDataSourceMapper.selectByPrimaryKey(dataSourceModel.getId());
                 if (StringUtils.isBlank(data.getKeyinData()))
                     updateCellValueForDataSourceChange(dataSourceModel, data.getAmount());
                 originalAmount = dataSourceModel.getAmount() != null ? dataSourceModel.getAmount() : new BigDecimal("0");
                 dataSourceModel.setName(data.getName());
                 dataSourceModel.setDescription(data.getDescription());
-                dataSourceModel.setAmount(data.getAmount());
+                dataSourceModel.setAmount(data.getAmount()==null?new BigDecimal(0):data.getAmount());
                 dataSourceModel.setUpdateBy("Admin");
                 dataSourceModel.setKeyinData(data.getKeyinData());
                 dataSourceModel.setUpdateTime(new Date());
-                periodDataSourceMapper.updateByPrimaryKeySelective(dataSourceModel);
+                periodDataSourceMapper.updateByPrimaryKey(dataSourceModel);
             } else {
                 dataSourceModel = new PeriodDataSource();
                 Long cellDataSourceId = distributedIdService.nextId();