Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!175

atms-api/src/main/java/pwc/taxtech/atms/common/util/MyAsserts.java

@@ -41,4 +41,12 @@ public class MyAsserts {
     public static void assertEmpty(Collection obj, ApiException exception) {
         if (obj != null && !obj.isEmpty()) throw exception;
     }
+
+    public static <T,S> void assertEq(T t,S s,ApiException exception){
+        if(s != t) throw exception;
+    }
+
+    public static <T,S> void assertNotEq(T t,S s,ApiException exception){
+        if(s == t) throw exception;
+    }
 }

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

@@ -10,6 +10,7 @@ import pwc.taxtech.atms.dpo.ReportDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.vatdto.*;
 import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
+import pwc.taxtech.atms.vat.entity.PeriodJob;
 import pwc.taxtech.atms.vat.entity.VatEnterpriseAccount;
 import pwc.taxtech.atms.vat.service.impl.ReportServiceImpl;
 
@@ -32,22 +33,22 @@ public class ReportController {
         return reportService.getReportTemplate(projectId, EnumServiceType.getEnumByCode(serviceType), period);
     }
 
-    @RequestMapping(value = "updateConfig/{projectId}/{ifDeleteManualDataSource}/{period}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public OperationResultDto updateConfig(@PathVariable String projectId,
-                                           @PathVariable Boolean ifDeleteManualDataSource,
-                                           @PathVariable Integer period,
-                                           @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}/{mergeManual}/{period}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public OperationResultDto generateAllData(@PathVariable String projectId, @PathVariable Integer period, @RequestParam Optional<String> generator,
+                                              @PathVariable Boolean mergeManual) {
+        return reportService.generateData(projectId, EnumServiceType.VAT, mergeManual, period, null, generator);
     }
 
-    @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) {
-        return reportService.generateData(projectId, EnumServiceType.VAT, ifDeleteManualDataSource, period, null, generator);
+    @RequestMapping(value = "getRunningJob/{projectId}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ResponseBody
+    public PeriodJob getRunningJob(@PathVariable String projectId, @PathVariable Integer period) {
+        return reportService.getRunningJob(projectId, period);
+    }
+
+    @RequestMapping(value = "getJobStatus/{projectId}//{period}/{jobId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ResponseBody
+    public PeriodJob getJobStatus(@PathVariable String projectId, @PathVariable Integer period, @PathVariable String jobId) {
+        return reportService.getJobStatus(projectId, period, jobId);
     }
 
     @RequestMapping(value = "templateReferences/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import lombok.Getter;
+import pwc.taxtech.atms.common.util.MyAsserts;
+import pwc.taxtech.atms.entity.Project;
+import pwc.taxtech.atms.entity.TemplateGroup;
+import pwc.taxtech.atms.exception.Exceptions;
+import pwc.taxtech.atms.service.impl.Message;
+import pwc.taxtech.atms.vat.entity.PeriodCellTemplate;
+import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
+import pwc.taxtech.atms.vat.entity.PeriodTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+public class PeriodResources {
+    Project project;
+    List<PeriodTemplate> periodTemplates = new ArrayList<>();
+    List<PeriodCellTemplate> periodCellTemplates = new ArrayList<>();
+    List<PeriodCellTemplateConfig> periodCellTemplateConfigs = new ArrayList<>();
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
+    public void putAllTemplate(List<PeriodTemplate> periodTemplates) {
+        this.periodTemplates.addAll(periodTemplates);
+    }
+
+    public List<Long> getTemolateIds() {
+        MyAsserts.assertNotEmpty(periodTemplates, Exceptions.NOT_FOUND_TEMPLATE_EXCEPTION);
+        return periodTemplates.stream()
+                .map(PeriodTemplate::getTemplateId)
+                .collect(Collectors.toList());
+    }
+
+    public void putAllCellTemplate(List<PeriodCellTemplate> periodCellTemplates) {
+        this.periodCellTemplates.addAll(periodCellTemplates);
+    }
+
+    public void putAllCellTemplateConfig(List<PeriodCellTemplateConfig> periodCellTemplateConfigs) {
+        this.periodCellTemplateConfigs.addAll(periodCellTemplateConfigs);
+    }
+
+    public Long getTemplateGroupId(){
+        return  periodTemplates.get(0).getTemplateGroupId();
+    }
+}

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.common.util.MyAsserts;
+import pwc.taxtech.atms.entity.Project;
+import pwc.taxtech.atms.entity.Template;
+import pwc.taxtech.atms.exception.Exceptions;
+import pwc.taxtech.atms.vat.entity.PeriodJob;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+public class WrapPeriodJobDto {
+    public static final String STATUS_BEGIN = "Begin";
+    public static final String STATUS_CANCEL = "Cancel";
+    public static final String STATUS_ERROR = "Error";
+    public static final String STATUS_END = "End";
+
+    public static final String STEP_UPDATE_CONFIG = "UpdateConfig";
+
+    public static PeriodJob createReportGenJob(String projectId, Integer period, List<Template> templates) {
+        MyAsserts.assertNotEmpty(templates, Exceptions.NOT_FOUND_TEMPLATE_EXCEPTION);
+        PeriodJob job = new PeriodJob();
+        job.setCreateTime(new Date());
+        job.setName("Gen All Report");
+        job.setProjectId(projectId);
+        job.setPeriod(period);
+        job.setId(UUID.randomUUID().toString());
+        job.setStatus(STATUS_BEGIN);
+        job.setCurrentStep(STEP_UPDATE_CONFIG);
+
+        StringBuilder builder = new StringBuilder(STEP_UPDATE_CONFIG);
+        templates.forEach(m -> {
+            builder.append(",").append(m.getCode());
+        });
+
+        job.setStepsCode(builder.toString());
+        return job;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/exception/ConflictException.java

+package pwc.taxtech.atms.exception;
+
+import org.springframework.http.ResponseEntity;
+
+import javax.net.ssl.SSLEngineResult;
+
+import static org.springframework.http.HttpStatus.CONFLICT;
+
+public class ConflictException extends ApiException {
+    public ConflictException() {
+        super();
+    }
+
+    public ConflictException(String message) {
+        super(message);
+    }
+
+    public ConflictException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ConflictException(Throwable cause) {
+        super(cause);
+    }
+
+    @Override
+    public <Object> ResponseEntity handle() {
+        return ResponseEntity.status(CONFLICT).build();
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/exception/Exceptions.java

@@ -10,6 +10,12 @@ public class Exceptions {
    public static final ApiException EMPTY_PROJECT_PARAM = new BadParameterException("project is empty");
    public static final ApiException EMPTY_PRIODDATE_PARAM = new BadParameterException("period data is empty");
    public static final ApiException NOT_FOUND_REPORT_EXCEPTION =  new NotFoundException("not found report");
+   public static final ApiException NOT_FOUND_TEMPLATE_EXCEPTION =  new NotFoundException("not found template");
    public static final ApiException REPORT_HAS_COMMIT_EXCEPTION = new AlreadyExistsException("report approval has commit");
-   public static final ApiException SERVER_ERROR_EXCEPTION= new ServerErrorException("server error exception");
+   public static final ApiException SERVER_ERROR_EXCEPTION = new ServerErrorException("server error exception");
+   public static final ApiException TASK_HAS_BEGINNING = new ConflictException("task has beginning ..");
+   public static final ApiException PROJECT_EMPTY_EXCEPTION = new BadParameterException("projectId is empty");
+   public static final ApiException PROJECT_PROJECT_EXCEPTION = new NotFoundException("not found project");
+   public static final ApiException NOT_FOUND_TEMPLATE_GROUP_EXCEPTION = new NotFoundException("not found template group");
+   public static final ApiException NOT_FOUND_EXCEPTION = new NotFoundException("not found resources");
 }

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

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.vat.service.impl.report.functions;
 
 import lombok.Getter;
 import lombok.Setter;
+import pwc.taxtech.atms.entity.Project;
 import pwc.taxtech.atms.vat.service.impl.FormulaAgent;
 
 @Setter
@@ -36,4 +37,22 @@ public class FormulaContext {
     private FormulaAgent formulaAgent;
 
     //private Map<String, FormulaResult> replaceSpecialCellFormulaDic;
+
+    public static FormulaContext extractContextFromProject(Project project){
+        FormulaContext formulaContext = new FormulaContext();
+        formulaContext.setProjectId(project.getId());
+        formulaContext.setYear(project.getYear());
+        formulaContext.setIfRound(true);
+        formulaContext.setOrganizationId(project.getOrganizationId());
+        formulaContext.setIfRound(true);
+        return formulaContext;
+    }
+
+    public FormulaContext fixedFormula(Integer period,Long reportTemplateGroupId,FormulaAgent agent){
+        this.period=period;
+        this.formulaAgent=agent;
+        this.reportTemplateGroupId=reportTemplateGroupId;
+        this.isYear=(period==0);
+        return this;
+    }
 }

atms-dao/etc/generator-oracle/vatGeneratorConfig.xml

@@ -228,5 +228,11 @@
             <columnOverride column="YEAR" javaType="java.lang.Integer" />
         </table>
 
+        <table tableName="PERIOD_JOB" schema="tax_admin" domainObjectName="PeriodJob">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+            <columnOverride column="PERIOD" javaType="java.lang.Integer" />
+        </table>
+
   </context>
 </generatorConfiguration>
\ No newline at end of file

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

+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.PeriodJob;
+import pwc.taxtech.atms.vat.entity.PeriodJobExample;
+
+@Mapper
+public interface PeriodJobMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    long countByExample(PeriodJobExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(PeriodJobExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int insert(PeriodJob record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int insertSelective(PeriodJob record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    List<PeriodJob> selectByExampleWithRowbounds(PeriodJobExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    List<PeriodJob> selectByExample(PeriodJobExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    PeriodJob selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") PeriodJob record, @Param("example") PeriodJobExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") PeriodJob record, @Param("example") PeriodJobExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(PeriodJob record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(PeriodJob record);
+
+    @Select("SELECT " +
+            " ID AS id, " +
+            " NAME AS name, " +
+            " CURRENT_STEP AS currentStep, " +
+            " PROJECT_ID AS projectId, " +
+            " PERIOD AS period, " +
+            " STEPS_CODE AS stepsCode, " +
+            " CREATE_TIME AS createTime, " +
+            " STATUS AS status, " +
+            " ERROR_MSG AS errorMsg  " +
+            "FROM " +
+            " PERIOD_JOB  " +
+            "WHERE " +
+            " STATUS = 'Begin'  " +
+            " AND PROJECT_ID = #{projectId}  " +
+            " AND PERIOD =#{period}")
+    PeriodJob getRunningJob(@Param("projectId") String projectId, @Param("period") Integer period);
+
+    @Select("SELECT " +
+            " ID AS id, " +
+            " NAME AS name, " +
+            " CURRENT_STEP AS currentStep, " +
+            " PROJECT_ID AS projectId, " +
+            " PERIOD AS period, " +
+            " STEPS_CODE AS stepsCode, " +
+            " CREATE_TIME AS createTime, " +
+            " STATUS AS status, " +
+            " ERROR_MSG AS errorMsg  " +
+            "FROM " +
+            " PERIOD_JOB  " +
+            "WHERE " +
+            " PROJECT_ID = #{projectId}  " +
+            " AND PERIOD =#{period} " +
+            " AND ID = #{id}")
+    PeriodJob getJobStatus(@Param("projectId") String projectId, @Param("period") Integer period,@Param("id") String id);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/PeriodJob.java

+package pwc.taxtech.atms.vat.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table TAX_ADMIN.PERIOD_JOB
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class PeriodJob implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.CURRENT_STEP
+     *
+     * @mbg.generated
+     */
+    private String currentStep;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.PROJECT_ID
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.PERIOD
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.STEPS_CODE
+     *
+     * @mbg.generated
+     */
+    private String stepsCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.CREATE_TIME
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.STATUS
+     *
+     * @mbg.generated
+     */
+    private String status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TAX_ADMIN.PERIOD_JOB.ERROR_MSG
+     *
+     * @mbg.generated
+     */
+    private String errorMsg;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.ID
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.ID
+     *
+     * @param id the value for TAX_ADMIN.PERIOD_JOB.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.NAME
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.NAME
+     *
+     * @param name the value for TAX_ADMIN.PERIOD_JOB.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.CURRENT_STEP
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.CURRENT_STEP
+     *
+     * @mbg.generated
+     */
+    public String getCurrentStep() {
+        return currentStep;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.CURRENT_STEP
+     *
+     * @param currentStep the value for TAX_ADMIN.PERIOD_JOB.CURRENT_STEP
+     *
+     * @mbg.generated
+     */
+    public void setCurrentStep(String currentStep) {
+        this.currentStep = currentStep == null ? null : currentStep.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.PROJECT_ID
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.PROJECT_ID
+     *
+     * @mbg.generated
+     */
+    public String getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.PROJECT_ID
+     *
+     * @param projectId the value for TAX_ADMIN.PERIOD_JOB.PROJECT_ID
+     *
+     * @mbg.generated
+     */
+    public void setProjectId(String projectId) {
+        this.projectId = projectId == null ? null : projectId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.PERIOD
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.PERIOD
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.PERIOD
+     *
+     * @param period the value for TAX_ADMIN.PERIOD_JOB.PERIOD
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.STEPS_CODE
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.STEPS_CODE
+     *
+     * @mbg.generated
+     */
+    public String getStepsCode() {
+        return stepsCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.STEPS_CODE
+     *
+     * @param stepsCode the value for TAX_ADMIN.PERIOD_JOB.STEPS_CODE
+     *
+     * @mbg.generated
+     */
+    public void setStepsCode(String stepsCode) {
+        this.stepsCode = stepsCode == null ? null : stepsCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.CREATE_TIME
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.CREATE_TIME
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.CREATE_TIME
+     *
+     * @param createTime the value for TAX_ADMIN.PERIOD_JOB.CREATE_TIME
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.STATUS
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.STATUS
+     *
+     * @mbg.generated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.STATUS
+     *
+     * @param status the value for TAX_ADMIN.PERIOD_JOB.STATUS
+     *
+     * @mbg.generated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TAX_ADMIN.PERIOD_JOB.ERROR_MSG
+     *
+     * @return the value of TAX_ADMIN.PERIOD_JOB.ERROR_MSG
+     *
+     * @mbg.generated
+     */
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TAX_ADMIN.PERIOD_JOB.ERROR_MSG
+     *
+     * @param errorMsg the value for TAX_ADMIN.PERIOD_JOB.ERROR_MSG
+     *
+     * @mbg.generated
+     */
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg == null ? null : errorMsg.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.PERIOD_JOB
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", currentStep=").append(currentStep);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
+        sb.append(", stepsCode=").append(stepsCode);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", status=").append(status);
+        sb.append(", errorMsg=").append(errorMsg);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

@@ -48,9 +48,15 @@
             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}));
-            },
+            generateAll: function (projectId, isMergeManualDataSource, period, generator) {
+                return $http.post('/Report/generateByTotal/' + projectId + '/' + isMergeManualDataSource + '/' + period + '?generator=' + generator , {}, apiConfig.createVat({ignoreLoadingBar: true}));
+            },
+            getRunningJob: function (projectId, period) {
+                 return $http.get('/Report/getRunningJob/' + projectId+'/'+period,  apiConfig.createVat());
+             },
+            getJobStatus: function (projectId, period, jobId) {
+                 return $http.get('/Report/getJobStatus/' + projectId+'/'+period+'/'+jobId, apiConfig.createVat({ignoreLoadingBar: true}));
+             },
             getReportData: function (reportId) {
                 return $http.get('/Report/reportData/' + reportId, apiConfig.createVat());
             },

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

@@ -3,6 +3,7 @@
     <div class="vat-caculate-data-title" ng-if="tasks.length > 0">
         <!--<span translate="vatCaculateDataDesc"></span>-->
         <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate()"></button>
+        <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate2()"></button>
         <span ng-click="showOperateLogPop()"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
     </div>