Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

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

@@ -3,13 +3,10 @@ package pwc.taxtech.atms.controller;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.taxadmin.ProjectStatusManageDto;
+import pwc.taxtech.atms.entity.ProjectStatusManage;
 import pwc.taxtech.atms.service.impl.IdentityServiceImpl;
 import pwc.taxtech.atms.service.impl.ProjectStatusManageServiceImpl;
 
@@ -42,4 +39,12 @@ public class ProjectStatusManageController {
                                                                        @PathVariable Integer periodId) {
         return projectStatusManageService.getProjectStatus(projectId, periodId);
     }
+
+    @RequestMapping(value = {"isProjectStatusExisted/{projectId}/{periodId}"}, method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ResponseBody
+    public OperationResultDto<ProjectStatusManage> isProjectStatusExisted(@PathVariable String projectId,
+                                                                          @PathVariable int periodId) {
+        return projectStatusManageService.isProjectStatusExisted(projectId, periodId);
+    }
 }

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

@@ -30,15 +30,17 @@ public class ReportController {
     public OperationResultDto updateConfig(@PathVariable String projectId,
                                            @PathVariable Boolean ifDeleteManualDataSource,
                                            @PathVariable Integer period,
-                                           @RequestParam String generator) {
-        return reportService.updateConfig(projectId, period, ifDeleteManualDataSource, generator);
+                                           @RequestParam String generator,
+                                           @RequestParam Boolean mergeManual) {
+        return reportService.updateConfig(projectId, period, ifDeleteManualDataSource, generator, mergeManual);
 //        OperationResultDto operationResultDto = new OperationResultDto();
 //        operationResultDto.setResult(true);
 //        return  operationResultDto;
     }
 
     @RequestMapping(value = "generateByTotal/{projectId}/{ifDeleteManualDataSource}/{period}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public OperationResultDto generateAllData(@PathVariable String projectId, @PathVariable Boolean ifDeleteManualDataSource, @PathVariable Integer period, @RequestParam Optional<String> generator) {
+    public OperationResultDto generateAllData(@PathVariable String projectId, @PathVariable Boolean ifDeleteManualDataSource,
+                                              @PathVariable Integer period, @RequestParam Optional<String> generator) {
         return reportService.generateData(projectId, EnumServiceType.VAT, ifDeleteManualDataSource, period, null, generator);
     }
 
@@ -124,4 +126,9 @@ public class ReportController {
     public OperationResultDto<String> getDataSourceDetailList(@PathVariable Long dataSourceId) {
         return reportService.getDataSourceDetailList(dataSourceId);
     }
+
+    @RequestMapping(value = "hasManualDataSource/{projectId}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public  Boolean hasManualDataSource(@PathVariable String projectId, @PathVariable Integer period) {
+        return reportService.hasManualDataSource(projectId,period);
+    }
 }
\ No newline at end of file

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

-package pwc.taxtech.atms.dto.vatdto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Getter
-@Setter
-public class CellTemplateConfigGroupDto {
-    Integer columnIndex;
-
-    Integer rowIndex;
-
-    String columnName;
-
-    String rowName;
-
-    Integer dataType;
-
-    Boolean isReadOnly;
-    @JsonProperty("cellTemplateID")
-    Long cellTemplateId;
-    @JsonProperty("reportTemplateID")
-    Long reportTemplateId;
-
-    String comment;
-
-    public CellTemplateConfigGroupDto(Integer columnIndex, Integer rowIndex
-            , String columnName, String rowName, Integer dataType, Boolean isReadOnly
-            , Long cellTemplateId, Long reportTemplateId, String comment) {
-        this.columnIndex = columnIndex;
-        this.rowIndex = rowIndex;
-        this.columnName = columnName;
-        this.rowName = rowName;
-        this.dataType = dataType;
-        this.isReadOnly = isReadOnly;
-        this.cellTemplateId = cellTemplateId;
-        this.reportTemplateId = reportTemplateId;
-        this.comment = comment;
-    }
-
-
-    public Map<String, Map<String, Object>> toStr() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(this.getColumnIndex());
-        sb.append(this.getRowIndex());
-        sb.append(this.getColumnName());
-        sb.append(this.getRowName());
-        sb.append(this.getDataType());
-        sb.append(this.getIsReadOnly());
-        sb.append(this.getCellTemplateId());
-        sb.append(this.getReportTemplateId());
-        sb.append(this.getComment());
-
-        Map<String, Map<String, Object>> result = new HashMap<>();
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("columnIndex", this.getColumnIndex());
-        map.put("rowIndex", this.getRowIndex());
-        map.put("columnName", this.getColumnName());
-        map.put("rowName", this.getRowName());
-        map.put("dataType", this.getDataType());
-        map.put("isReadOnly", this.getIsReadOnly());
-        map.put("cellTemplateId", this.getCellTemplateId());
-        map.put("reportTemplateId", this.getReportTemplateId());
-        map.put("comment", this.getComment());
-
-        result.put(sb.toString(), map);
-        return result;
-    }
-}

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

 package pwc.taxtech.atms.service.impl;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -124,4 +125,15 @@ public class ProjectStatusManageServiceImpl {
         }
 
     }
+
+    public OperationResultDto<ProjectStatusManage> isProjectStatusExisted(String projectId, int periodId) {
+        ProjectStatusManageExample example = new ProjectStatusManageExample();
+        example.createCriteria().andProjectIdEqualTo(projectId).andPeriodIdEqualTo(periodId);
+        List<ProjectStatusManage> manage = projectStatusManageMapper.selectByExample(example);
+        OperationResultDto<ProjectStatusManage> dto = new OperationResultDto();
+        dto.setResult(true);
+        dto.setResultMsg(StringUtils.EMPTY);
+        dto.setData(manage.isEmpty() ? null : manage.get(0));
+        return dto;
+    }
 }

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

@@ -136,8 +136,6 @@ public class RuleEngineeConfigServiceImpl extends AbstractService {
             if ("Add".equals(tprrdo.getAction())) {
                 taxPayerReportRule.setId(distributedIdService.nextId());
                 taxPayerReportRuleMapper.insert(taxPayerReportRule);
-//                operationService.addDataAddLog(taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
-//                        "AddRuleEngineConfiguration", "纳税类型", "纳税类型添加特殊机构", OperateLogType.OperationLogRuleEngine);
             } else if ("Update".equals(tprrdo.getAction())) {
                 TaxPayerReportRule old = taxPayerReportRuleMapper.selectByPrimaryKey(Long.parseLong(reportDto.getId()));
                 TaxPayerReportRule original = new TaxPayerReportRule();

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

@@ -20,7 +20,6 @@ import pwc.taxtech.atms.constant.enums.CellDataSourceType;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 import pwc.taxtech.atms.dao.ProjectMapper;
 import pwc.taxtech.atms.dto.vatdto.CellCalcInfoDto;
-import pwc.taxtech.atms.dto.vatdto.CellTemplateConfigGroupDto;
 import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.service.impl.DistributedIdService;
 import pwc.taxtech.atms.service.impl.HttpFileService;
@@ -338,6 +337,7 @@ public class ReportGeneratorImpl {
                                         dataSource.setPeriod(period);
                                         dataSource.setCellTemplateId(periodCellTemplateConfig.getCellTemplateId());
                                         dataSource.setType(FormulaDataSourceType.Report.getCode());
+                                        dataSource.setProjectId(projectId);
                                         periodDataSourceMapper.insertSelective(dataSource);
                                         //这里有个问题就是DataSource的数据有了，但是celldatasource的数据没有，后面无法关联celldata和DataSource
                                         //解决办法就是 在存DataSource的时候就先把celldata的数据加好
@@ -526,32 +526,33 @@ public class ReportGeneratorImpl {
 
         fixedPCTParsedFormula(periodCellTemplateConfigExtendDtos, projectId, period);
         List<CellCalcInfoDto> cellCalcInfoDtos = new ArrayList<>();
-        periodCellTemplateConfigExtendDtos.stream().collect(Collectors.groupingBy(a ->
-                new CellTemplateConfigGroupDto(a.getColumnIndex(), a.getRowIndex()
-                        , a.getColumnName(), a.getRowName(), a.getDataType(), a.getReadOnly()
-                        , a.getCellTemplateId(), a.getReportTemplateId(), a.getComment()).toStr())).forEach((x, y) -> {
-            Optional<Map<String, Object>> result = x.values().stream().findFirst();
-            if (result.isPresent()) {
-                CellCalcInfoDto cellCalcInfoDto = new CellCalcInfoDto();
-                cellCalcInfoDto.setColumnIndex(Integer.parseInt(result.get().get("columnIndex").toString()));
-                cellCalcInfoDto.setColumnName(result.get().get("columnName") == null ? "" : result.get().get("columnName").toString());
-                cellCalcInfoDto.setRowIndex(Integer.parseInt(result.get().get("rowIndex").toString()));
-                cellCalcInfoDto.setRowName(result.get().get("rowName") == null ? "" : result.get().get("rowName").toString());
-                cellCalcInfoDto.setFormula(convertListToString(y.stream()
-                        .map(PeriodCellTemplateConfig::getFormula).collect(Collectors.toList())));
-                cellCalcInfoDto.setParsedFormula(convertListToString(y.stream()
-                        .map(PeriodCellTemplateConfig::getParsedFormula).collect(Collectors.toList())));
-                //todo: add validation at here later
-                cellCalcInfoDto.setCellTemplateId(result.get().get("cellTemplateId").toString());
-                cellCalcInfoDto.setReportTemplateId(Long.parseLong(result.get().get("reportTemplateId").toString()));
-                cellCalcInfoDto.setDataType(Integer.parseInt(result.get().get("dataType").toString()));
-                cellCalcInfoDto.setIsReadOnly(Boolean.valueOf(result.get().get("isReadOnly").toString()));
-                cellCalcInfoDto.setComment(result.get().get("comment") == null ? "" : result.get().get("comment").toString());
-                cellCalcInfoDto.setConfigList(y.stream()
-                        .map(PeriodCellTemplateConfigExtendDto::getPeriodCellTemplateConfig)
-                        .collect(Collectors.toList()));
-                cellCalcInfoDtos.add(cellCalcInfoDto);
-            }
+        Map<String, List<PeriodCellTemplateConfigExtendDto>> myStream = new HashMap<>();
+        for (PeriodCellTemplateConfigExtendDto pctce : periodCellTemplateConfigExtendDtos) {
+            String key = pctce.getRowIndex() + "_" + pctce.getColumnIndex() + "_" + pctce.getReportTemplateId();
+            if (!myStream.containsKey(key)) myStream.put(key, new ArrayList<>());
+            myStream.get(key).add(pctce);
+        }
+
+        myStream.keySet().forEach(m -> {
+            PeriodCellTemplateConfigExtendDto first = myStream.get(m).get(0);
+            CellCalcInfoDto cellCalcInfoDto = new CellCalcInfoDto();
+            cellCalcInfoDto.setColumnIndex(first.getColumnIndex());
+            cellCalcInfoDto.setColumnName(first.getColumnName());
+            cellCalcInfoDto.setRowIndex(first.getRowIndex());
+            cellCalcInfoDto.setRowName(first.getRowName());
+            cellCalcInfoDto.setFormula(convertListToString(myStream.get(m).stream()
+                    .map(PeriodCellTemplateConfig::getFormula).collect(Collectors.toList())));
+            cellCalcInfoDto.setParsedFormula(convertListToString(myStream.get(m).stream()
+                    .map(PeriodCellTemplateConfig::getParsedFormula).collect(Collectors.toList())));
+            //todo: add validation at here later
+            cellCalcInfoDto.setCellTemplateId(first.getCellTemplateId() + "");
+            cellCalcInfoDto.setReportTemplateId(first.getReportTemplateId());
+            cellCalcInfoDto.setDataType(first.getDataType());
+            cellCalcInfoDto.setIsReadOnly(first.getReadOnly());
+            cellCalcInfoDto.setComment(first.getComment());
+            cellCalcInfoDto.setConfigList(myStream.get(m).stream()
+                    .map(PeriodCellTemplateConfigExtendDto::getPeriodCellTemplateConfig).collect(Collectors.toList()));
+            cellCalcInfoDtos.add(cellCalcInfoDto);
         });
         return cellCalcInfoDtos;
     }

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.util.SpringContextUtil;
+import pwc.taxtech.atms.constant.Constant;
 import pwc.taxtech.atms.constant.enums.*;
 import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dpo.ReportDto;
@@ -156,7 +157,7 @@ public class ReportServiceImpl {
         return operationResult;
     }
 
-    private void clearPeriodData(String projectId, Integer period, List<Long> templateIds) {
+    private void clearPeriodData(String projectId, Integer period, List<Long> templateIds, boolean isMergeManualData) {
         if (templateIds.isEmpty()) templateIds.add(Long.MAX_VALUE);
         PeriodFormulaBlockExample periodFormulaBlockExample = new PeriodFormulaBlockExample();
         periodFormulaBlockExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
@@ -183,10 +184,35 @@ public class ReportServiceImpl {
         periodTaxPayerReportRuleMapper.deleteByExample(periodTaxPayerReportRuleExample);
 
         PeriodDataSourceExample periodDataSourceExample = new PeriodDataSourceExample();
-        periodDataSourceExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
+        periodDataSourceExample.createCriteria().andProjectIdEqualTo(projectId)
+                .andPeriodEqualTo(period);
         List<PeriodDataSource> periodDataSources = periodDataSourceMapper.selectByExample(periodDataSourceExample);
         List<Long> periodDsIds = Lists.newArrayList(Long.MAX_VALUE);
-        periodDsIds.addAll(periodDataSources.stream().map(m -> m.getId()).collect(Collectors.toList()));
+        List<Long> periodManualDsIds = new ArrayList<>();
+        List<Long> periodManualCellDataIds = new ArrayList<>();
+
+        if (isMergeManualData) {
+            periodDataSources.forEach(m -> {
+                if (m.getType().intValue() != FormulaDataSourceType.KeyInSource.getCode().intValue()) {
+                    periodDsIds.add(m.getId());
+                } else {
+                    periodManualDsIds.add(m.getId());
+                }
+            });
+
+            if (!periodManualDsIds.isEmpty()) {
+                PeriodCellDataSourceExample periodCellDataSourceExample = new PeriodCellDataSourceExample();
+                periodCellDataSourceExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period)
+                        .andDataSourceIdIn(periodManualDsIds);
+                List<PeriodCellDataSource> manualCellDataSource = periodCellDataSourceMapper.selectByExample(periodCellDataSourceExample);
+                if (!manualCellDataSource.isEmpty())
+                    periodManualCellDataIds.addAll(manualCellDataSource.stream().map(PeriodCellDataSource::getCellDataId)
+                            .collect(Collectors.toList()));
+            }
+        } else {
+            periodDsIds.addAll(periodDataSources.stream().map(m -> m.getId()).collect(Collectors.toList()));
+        }
+
         PeriodDataSourceDetailExample periodDataSourceDetailExample = new PeriodDataSourceDetailExample();
         periodDataSourceDetailExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period)
                 .andDataSourceIdIn(periodDsIds);
@@ -197,7 +223,10 @@ public class ReportServiceImpl {
                 .andDataSourceIdIn(periodDsIds);
         periodCellDataSourceMapper.deleteByExample(periodCellDataSourceExample);
 
-        periodDataSourceMapper.deleteByExample(periodDataSourceExample);
+
+        PeriodDataSourceExample periodDataSourceDeleteExample = new PeriodDataSourceExample();
+        periodDataSourceDeleteExample.createCriteria().andIdIn(periodDsIds);
+        periodDataSourceMapper.deleteByExample(periodDataSourceDeleteExample);
 
         PeriodReportExample periodReportExample = new PeriodReportExample();
         periodReportExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
@@ -206,14 +235,21 @@ public class ReportServiceImpl {
         List<Long> reportIds = Lists.newArrayList(Long.MAX_VALUE);
         reportIds.addAll(reports.stream().map(m -> m.getId()).collect(Collectors.toList()));
         PeriodCellDataExample periodCellDataExample = new PeriodCellDataExample();
-        periodCellDataExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andReportIdIn(
-                reportIds);
+
+        if (!periodManualCellDataIds.isEmpty()) {
+            periodCellDataExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andReportIdIn(
+                    reportIds).andIdNotIn(periodManualCellDataIds);
+        } else {
+            periodCellDataExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andReportIdIn(
+                    reportIds);
+        }
         periodCellDataMapper.deleteByExample(periodCellDataExample);
         periodReportMapper.deleteByExample(periodReportExample);
 
     }
 
-    public OperationResultDto updateConfig(String projectId, Integer period, Boolean ifDeleteManualDataSource, String generator) {
+    public OperationResultDto updateConfig(String projectId, Integer period, Boolean ifDeleteManualDataSource,
+                                           String generator, Boolean isMergeManualData) {
         OperationResultDto result = new OperationResultDto();
         try {
             if (period == null) {
@@ -240,7 +276,7 @@ public class ReportServiceImpl {
             Long templateGroupId = projectMapper.getTemplateGroupIdByProject(projectId, EnumServiceType.VAT.getCode());
             if (templateGroupId != null && templateGroupId != 0) {
                 // 先进行数据清理，包括period开头的所有报表配置表 条件Period
-                clearPeriodData(projectId, period, exceptTemplateIds);
+                clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
                 // 根据templategroupid 把 template 插入到 periodTemplate
                 TemplateExample example = new TemplateExample();
                 example.createCriteria().andTemplateGroupIdEqualTo(templateGroupId);
@@ -854,8 +890,8 @@ public class ReportServiceImpl {
                 dataSourceModel.setId(cellDataSourceId);
                 dataSourceModel.setType(FormulaDataSourceType.KeyInSource.getCode());
                 dataSourceModel.setName(data.getName());
-                dataSourceModel.setCellTemplateId(Long.parseLong(data.getCellTemplateId()));
                 dataSourceModel.setDescription(data.getDescription());
+                dataSourceModel.setCellTemplateId(Long.parseLong(data.getCellTemplateId()));
                 dataSourceModel.setAmount(data.getAmount());
                 if (periodCellTemplate.isPresent()) {
                     dataSourceModel.setRowIndex(periodCellTemplate.get().getRowIndex());
@@ -865,6 +901,7 @@ public class ReportServiceImpl {
                 dataSourceModel.setUpdateTime(new Date());
                 dataSourceModel.setCreateBy("admin");
                 dataSourceModel.setUpdateBy("admin");
+                dataSourceModel.setProjectId(projectId);
                 dataSourceModel.setPeriod(data.getPeriod());
 
                 PeriodCellDataSource cellDataSource = new PeriodCellDataSource();
@@ -1179,4 +1216,8 @@ public class ReportServiceImpl {
                 return "";
         }
     }
+
+    public Boolean hasManualDataSource(String projectId, Integer period) {
+        return periodReportMapper.hasManualDataSource(projectId, period) > 0;
+    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/dao/CellTemplateConfigMapper.java

@@ -109,7 +109,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     List<CellTemplateConfig> getCellTemplateConfigByTemplateId(@Param("templateId") Long templateId);
 
-    int deleteCellTemplateConfigByCellTemplate(@Param("templateDbId") Long templateDbId);
+    int deleteCellTemplateConfigByCellTemplate(@Param("templateId") Long templateId);
 
     void batchInsert(List<CellTemplateConfig> list);
 

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodReportMapper.java

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.vat.dao;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.entity.PeriodReport;
@@ -105,4 +106,16 @@ public interface PeriodReportMapper extends MyVatMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(PeriodReport record);
+
+    @Select("" +
+            "SELECT " +
+            " COUNT( 1 )  " +
+            "FROM " +
+            " PERIOD_DATA_SOURCE pds  " +
+            "WHERE " +
+            " pds.PROJECT_ID = #{projectId}  " +
+            " AND pds.TYPE = 10  " +
+            " AND pds.PERIOD = #{period}" +
+            "")
+    int hasManualDataSource(@Param("projectId") String projectId, @Param("period") Integer period);
 }
\ No newline at end of file

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

@@ -31,7 +31,7 @@
     <insert id="batchInsert" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
         INSERT ALL
         <foreach collection="list" item="item">
-            INTO  TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
+            INTO  CELL_TEMPLATE_CONFIG VALUES
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 <choose>
                     <when test="item.id != null">
@@ -198,7 +198,7 @@
     <insert id="batchInsert2" parameterType="pwc.taxtech.atms.entity.CellTemplateConfig">
         INSERT ALL
         <foreach collection="list" item="item" >
-            INTO TAX_ADMIN.CELL_TEMPLATE_CONFIG VALUES
+            INTO CELL_TEMPLATE_CONFIG VALUES
             (#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER},
             #{item.reportTemplateId,jdbcType=INTEGER},
             #{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR},

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

@@ -289,20 +289,20 @@
         </association>
         <association property="cellDataSource" javaType="pwc.taxtech.atms.vat.entity.CellDataSource">
             <id column="CELL_DATA_SOURCE_ID" jdbcType="BIGINT" property="id"/>
-            <result column="CELL_DATA_SOURCE_OPERATION_TYPE" property="operationType" javaType="java.lang.Integer"
+            <result column="OPERATION_TYPE" property="operationType" javaType="java.lang.Integer"
                     jdbcType="INTEGER"/>
         </association>
     </resultMap>
 
     <select id="getManualDataSource2" parameterType="java.lang.Long" resultMap="dataSourceCellDataDto">
         SELECT
-        CELL_DATA_SOURCE.ID AS ID,
+        CELLDATASOURCE.ID AS ID,
         CELLDATA.ID AS CELL_DATA_ID,
         CELLDATA.DATA AS CELL_DATA_DATA,
         CELLDATA.CELL_TEMPLATE_ID AS CELL_DATA_TEMPLATE_ID,
         CELLDATA.REPORT_ID AS CELL_DATA_REPORT_ID,
         CELLDATASOURCE.ID AS CELL_DATA_SOURCE_ID,
-        CELLDATASOURCE.OPERATION_TYPE AS CELL_DATA_SOURCE_OPERATION_TYPE
+        CELLDATASOURCE.OPERATION_TYPE AS OPERATION_TYPE
         FROM
         CELL_DATA CELLDATA
         JOIN
@@ -310,7 +310,7 @@
         ON
         CELLDATA.ID = CELLDATASOURCE.CELL_DATA_ID
         WHERE
-        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} LIMIT 1
+        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} AND ROWNUM = 1
     </select>
 
     <!--DELETE FROM period_tax_rule_setting WHERE period=#{period,jdbcType=INTEGER};-->

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

@@ -106,13 +106,13 @@
         FROM
         PERIOD_CELL_TEMPLATE CT
         JOIN
-        REPORT R
+        PERIOD_REPORT R
         ON
         CT.REPORT_TEMPLATE_ID = R.TEMPLATE_ID
         AND CT.PERIOD = R.PERIOD
         WHERE
         CT.CELL_TEMPLATE_ID = #{cellTemplateId,jdbcType=BIGINT}
-        AND R.ID = #{reportId,jdbcType=BIGINT} LIMIT 1
+        AND R.ID = #{reportId,jdbcType=BIGINT} AND ROWNUM = 1
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -306,7 +306,7 @@
         AND CDS.CELL_DATA_ID = #{cellDataID,jdbcType=BIGINT}
     </select>
 
-  <resultMap id="dataSourceCellDataDto" type="pwc.taxtech.atms.dto.vatdto.DataSourceCellDataDto">
+  <resultMap id="dataSourceCellDataDto" type="pwc.taxtech.atms.vat.dpo.DataSourceCellDataDto">
     <id column="ID" jdbcType="BIGINT" property="id"/>
     <association property="cellData" javaType="pwc.taxtech.atms.vat.entity.CellData">
       <id column="CELL_DATA_ID" jdbcType="BIGINT" property="id"/>
@@ -316,19 +316,19 @@
     </association>
     <association property="cellDataSource" javaType="pwc.taxtech.atms.vat.entity.CellDataSource">
       <id column="CELL_DATA_SOURCE_ID" jdbcType="BIGINT" property="id"/>
-      <result column="CELL_DATA_SOURCE_OPERATION_TYPE" property="operationType" javaType="java.lang.Integer" jdbcType="INTEGER"/>
+      <result column="OPERATION_TYPE" property="operationType" javaType="java.lang.Integer" jdbcType="INTEGER"/>
     </association>
   </resultMap>
 
   <select id="getManualDataSource2" parameterType="java.lang.Long" resultMap="dataSourceCellDataDto">
         SELECT
-        CELL_DATA_SOURCE.ID AS ID,
+        CELLDATASOURCE.ID AS ID,
         CELLDATA.ID AS CELL_DATA_ID,
         CELLDATA.DATA AS CELL_DATA_DATA,
         CELLDATA.CELL_TEMPLATE_ID AS CELL_DATA_TEMPLATE_ID,
         CELLDATA.REPORT_ID AS CELL_DATA_REPORT_ID,
         CELLDATASOURCE.ID AS CELL_DATA_SOURCE_ID,
-        CELLDATASOURCE.OPERATION_TYPE AS CELL_DATA_SOURCE_OPERATION_TYPE
+        CELLDATASOURCE.OPERATION_TYPE AS OPERATION_TYPE
         FROM
         PERIOD_CELL_DATA CELLDATA
         JOIN
@@ -336,6 +336,6 @@
         ON
         CELLDATA.ID = CELLDATASOURCE.CELL_DATA_ID AND CELLDATA.PROJECT_ID = CELLDATASOURCE.PROJECT_ID
         WHERE
-        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} LIMIT 1
+        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} AND ROWNUM = 1
     </select>
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html

@@ -53,7 +53,7 @@
                         <div class="cell-info-subject">
                             <label class="cell-info-subject-label">{{'CellValue' | translate}}：</label>
                             <span title="{{detail.cellInfo.modifiedReportCell?detail.cellInfo.modifiedReportCell.comment:''}}">{{detail.cellInfo.money}}</span>
-                            <a href="javascript:void(0)" ng-click="openModifyCellDataDialog()">{{'Change' | translate}}</a>
+                            <!--<a href="javascript:void(0)" ng-click="openModifyCellDataDialog()">{{'Change' | translate}}</a>-->
                             <a href="javascript:void(0)" ng-if="detail.cellInfo.modifiedReportCell != null" ng-click="resetReportCell()">{{'Reset' | translate}}</a>
                         </div>
                     </div>

atms-web/src/main/webapp/app/common/vatservices/vatReportService.js

@@ -42,14 +42,14 @@
             //    citUpdateConfig: function (projectId, period?)
             //    citGetTemplate: function (projectId, period?)
 
-            updateConfig: function (projectId, ifDeleteManualDataSource, period, generator) {
-                return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
+            updateConfig: function (projectId, ifDeleteManualDataSource, period, generator, isMergeManualDataSource) {
+                return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator+ '&mergeManual='+isMergeManualDataSource, {}, apiConfig.createVat({ignoreLoadingBar: true}));
             },
             generate: function (projectId, templateId, ifDeleteManualDataSource, period, generator) {
                 return $http.post('/Report/generate/' + projectId + '/' + templateId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
             },
             generateAll: function (projectId, ifDeleteManualDataSource, period, generator) {
-                return $http.post('/Report/generateByTotal/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
+                return $http.post('/Report/generateByTotal/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator , {}, apiConfig.createVat({ignoreLoadingBar: true}));
             },
             getReportData: function (reportId) {
                 return $http.get('/Report/reportData/' + reportId, apiConfig.createVat());
@@ -178,7 +178,11 @@
             },
             getDataSourceDetailList: function (dataSourceId) {
                 return $http.get('/Report/getDataSourceDetailList/' + dataSourceId, apiConfig.createVat());
+            },
+            hasManualDataSource: function (projectId, period) {
+                return $http.get('/Report/hasManualDataSource/' + projectId+ '/' +period, apiConfig.createVat());
             }
+
         };
 
     }]);
\ No newline at end of file

atms-web/src/main/webapp/app/common/webservices/project.svc.js

@@ -43,8 +43,8 @@ webservices.factory('projectService', ['$http', 'apiConfig', function ($http, ap
         isImportedAnyData: function (periodId,projectId) {
             return $http.get('/ProjectStatusManage/isImportedAnyData/' + periodId + '/' + projectId, apiConfig.createVat());
         },
-        isProjectStatusExisted: function (dbName, periodId) {
-            return $http.get('/ProjectStatusManage/isProjectStatusExisted/' + dbName + '/' + periodId, apiConfig.createVat());
+        isProjectStatusExisted: function (projectId, periodId) {
+            return $http.get('/ProjectStatusManage/isProjectStatusExisted/' + projectId + '/' + periodId, apiConfig.createVat());
         },
         getProjectAllStatus: function (projectId) {
             return $http.get('/project/getProjectAllStatus/' + projectId, apiConfig.create());

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -11,6 +11,7 @@
         var taskList = [];
         var fixedRef = [];
         $scope.period = vatSessionService.month;
+        $scope.isMergeManualDataSource = false;
         $scope.moduleid = enums.vatModuleEnum.Import_CalculateData;
 
 
@@ -118,7 +119,9 @@
                         //}, function () {
                         //    taskError(_this);
                         //});
-                        vatReportService.updateConfig(vatSessionService.project.id, true, vatSessionService.month).success(function (data) {
+                        vatReportService.updateConfig(vatSessionService.project.id, true, vatSessionService.month,
+                                                      vatSessionService.logUser.id ? vatSessionService.logUser.id : "",
+                                                       $scope.isMergeManualDataSource ).success(function (data) {
                             var data = {result: true};
                             updateProgress(data, _this);
                             //vatReportService.getTemplateReferences(vatSessionService.month).then(function (refData) {
@@ -240,7 +243,8 @@
             });
         };
 
-        function doStartCaculate() {
+        function doStartCaculate(isMergeManualDataSource) {
+            $scope.isMergeManualDataSource = isMergeManualDataSource;
             $scope.readonly = true;
             $scope.resolveRef.length = 0;
             $scope.resolveRef.push({
@@ -287,15 +291,38 @@
                     },
                     function (isConfirm) {
                         if (isConfirm) {
-                            doStartCaculate();
-                        }
+                            vatReportService.hasManualDataSource(vatSessionService.project.id,vatSessionService.month).then(function (hasManual) {
+                               if(hasManual){
+                                   swal({
+                                       title: "warning!",
+                                       text: "是否保留手工数据！",
+                                       type: "warning",
+                                       showCancelButton: true,
+                                       confirmButtonColor: "#DD6B55",
+                                       confirmButtonText: $translate.instant('Yes'),
+                                       cancelButtonText: $translate.instant('No'),
+                                       closeOnConfirm: true,
+                                       closeOnCancel: true
+                                   },
+                                   function (isConfirm) {
+                                       if (isConfirm) {
+                                           doStartCaculate(true);
+                                       }else{
+                                           doStartCaculate(false);
+                                       }
+                                    });
+                               }else{
+                                   doStartCaculate(false);
+                               }
+                            });
+                         }
                         else {
                             swal.close();
                         }
-                    });
+                 });
             }
             else {
-                doStartCaculate();
+                doStartCaculate(false);
             }
         };
 
@@ -323,18 +350,27 @@
                 });
                 if (unstarted) {
                     var readyTasks;
+                    var isGenedAll = false;
+                    var isReport = false;
                     if (!_.isEmpty($scope.resolveRef)) {
                         readyTasks = _.reject($scope.tasks[task.seqNo + 1].items, function (t) {
                             return _.some($scope.resolveRef, function (x) {
+                                if($scope.tasks[task.seqNo + 1].isReportTask)isReport=true;
                                 return !x.resolved && x.referTo === t.id;
                             });
                         });
                     }
                     else {
                         readyTasks = $scope.tasks[task.seqNo + 1].items;
+                        if($scope.tasks[task.seqNo + 1].isReportTask)isReport=true;
                     }
+
                     readyTasks.forEach(function (t) {
-                        t.doTask();
+                        if(isReport&&!isGenedAll){
+                           t.doTask();
+                           isGenedAll=true;
+                        }
+
                         t.status = 'processing';
                         t.text = $translate.instant(t.status);
                     });
@@ -376,8 +412,16 @@
 
         var updateProgress = function (data, task, ifWriteLog) {
             if (data && data.result) {
-                task.status = 'completed';
-                task.text = $translate.instant(task.status);
+                if( $scope.tasks[task.seqNo].isReportTask){
+                    $scope.tasks[task.seqNo].items.forEach(function (t) {
+                         t.status = 'completed';
+                         t.text = $translate.instant(t.status);
+                    });
+                }else{
+                 task.status = 'completed';
+                 task.text = $translate.instant(task.status);
+                }
+
             }
             else {
                 task.status = 'error';