fix bug

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

@@ -8,10 +8,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -26,7 +24,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import pwc.taxtech.atms.analysis.entity.AnalysisTax;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.POIUtil;
 import pwc.taxtech.atms.common.message.ErrorMessage;
@@ -61,7 +58,10 @@ import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -71,7 +71,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static pwc.taxtech.atms.common.util.FileExcelUtil.downloadExcel;
 import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
 
 @Component
@@ -352,17 +351,15 @@ public class ReportServiceImpl extends BaseService {
                 andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate).
                 andStatusEqualTo(0);
         List<RevenueTypeMapping> mappingList = revenueTypeMappingMapper.selectByExample(mappingExample);
-        //先清除数据
-        InvoiceRecord delRecord = new InvoiceRecord();
-        delRecord.setRevenueCofId(null);
-        if (!isMergeManualData) {
-            delRecord.setModifyRevenueCofId(null);
-        }
         InvoiceRecordExample delExample = new InvoiceRecordExample();
-        delExample.createCriteria().andProjectIdEqualTo(projectId)
-                .andProjectIdEqualTo(projectId).
+        delExample.createCriteria().andProjectIdEqualTo(projectId).
                 andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
-        invoiceRecordMapper.deleteByExample(delExample);
+        if (isMergeManualData) {
+            invoiceRecordMapper.clearRevenueCof(true, false, delExample);
+        } else {
+            invoiceRecordMapper.clearRevenueCof(true, true, delExample);
+        }
+
         Map<String, Long> map = new HashMap<>();
         for (RevenueTypeMapping mapping : mappingList) {
             if (!map.containsKey(mapping.getContent())) {