Merge branch 'sam_p1' into 'dev_mysql'

Sam p1

See merge request root/atms!417

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java

@@ -62,6 +62,8 @@ public class AnalysisJob extends QuartzJobBean {
         logger.info(String.format("开始分析%s税种税金计算数据",period));
         analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
 
+        logger.info(String.format("开始分析%税金计算表数据",period));
+        analysisJobService.analysisTaxCalculation(orgs,period,EnumTbImportType.CoverImport.getCode());
     }
 
 }

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

@@ -1226,6 +1226,10 @@ public class AnalysisServiceImpl extends BaseService {
 
             logger.info(String.format("开始分析%s税种税金计算数据", period));
             analysisJobService.analysisTax(orgs, period, EnumTbImportType.CoverImport.getCode());
+            logger.info(String.format("开始分析%s税金计算表数据",period));
+            analysisJobService.analysisTaxCalculation(orgs,type,EnumTbImportType.CoverImport.getCode());
+
+
         } catch (Exception ex) {
             ex.printStackTrace();
             operationResultDto.setResult(false);

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

@@ -164,7 +164,7 @@ public class ReportUploadService extends BaseService {
         FileTypesExample fileTypesExample = new FileTypesExample();
         fileTypesExample.createCriteria().andFileTypeEqualTo("增值税及附加税费计算底稿");
         List<FileTypes> fileTypesList = fileTypesMapper.selectByExample(fileTypesExample);
-        if(CollectionUtils.isNotEmpty(dataList)){
+        if(CollectionUtils.isNotEmpty(fileTypesList)){
             taxDocument.setFileAttr(fileTypesList.get(0).getFileAttr());
             taxDocument.setFileTypeId(fileTypesList.get(0).getId());
         }

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

@@ -1484,6 +1484,7 @@ public class ReportServiceImpl extends BaseService {
                 return resultDto;
             }
 
+            //公司和年份生成的project
             Project project = projectMapper.selectByPrimaryKey(report.getProjectId());
             if (project == null) {
                 resultDto.setResult(false);

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

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.AnalysisTaxMainBusiness;
+import pwc.taxtech.atms.entity.AnalysisTaxMainBusinessExample;
+
+@Mapper
+public interface AnalysisTaxMainBusinessMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisTaxMainBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisTaxMainBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisTaxMainBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisTaxMainBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTaxMainBusiness> selectByExample(AnalysisTaxMainBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    AnalysisTaxMainBusiness selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisTaxMainBusiness record, @Param("example") AnalysisTaxMainBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisTaxMainBusiness record, @Param("example") AnalysisTaxMainBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisTaxMainBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisTaxMainBusiness record);
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort;
+import pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSortExample;
+
+@Mapper
+public interface AnalysisTaxMainBusinessSortMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisTaxMainBusinessSortExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisTaxMainBusinessSortExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisTaxMainBusinessSort record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisTaxMainBusinessSort record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTaxMainBusinessSort> selectByExample(AnalysisTaxMainBusinessSortExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    AnalysisTaxMainBusinessSort selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisTaxMainBusinessSort record, @Param("example") AnalysisTaxMainBusinessSortExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisTaxMainBusinessSort record, @Param("example") AnalysisTaxMainBusinessSortExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisTaxMainBusinessSort record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisTaxMainBusinessSort record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dpo/AnalysisBusinessValueDto.java

+package pwc.taxtech.atms.dpo;
+
+/**
+ * @Auther: sam
+ * @Date: 30/05/2019 16:28
+ * @Description:
+ */
+public class AnalysisBusinessValueDto {
+
+    private String data;
+
+    private String rowName;
+
+    private Integer rowIndex;
+
+    private Integer columnIndex;
+
+    public String getRowName() {
+        return rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getRowIndex() {
+        return rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public Integer getColumnIndex() {
+        return columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+}

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

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.dpo.AnalysisBusinessValueDto;
 import pwc.taxtech.atms.dpo.AnalysisSalesValueDto;
 import pwc.taxtech.atms.vat.entity.PeriodCellData;
 import pwc.taxtech.atms.vat.entity.PeriodCellDataExample;
@@ -117,4 +118,9 @@ public interface PeriodCellDataMapper extends MyVatMapper {
     List<AnalysisSalesValueDto> selectReportData(@Param("reportId") Long reportId,
                      @Param("projectId") String projectId,
                      @Param("period") Integer period);
+
+
+    List<AnalysisBusinessValueDto>selectReportDataByRowname(@Param("rowName") String rowName,
+                                                            @Param("projectId") String projectId,
+                                                            @Param("period") Integer period);
 }
\ No newline at end of file

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

@@ -139,4 +139,15 @@
           and cell_template.period = #{period}
           and cell_template.report_template_id = #{reportId}
     </select>
+
+    <select id= "selectReportDataByRowname" resultType="pwc.taxtech.atms.dpo.AnalysisBusinessValueDto">
+    select t.row_name rowName,d.`data` data,t.column_index columnIndex,t.row_index rowIndex from
+    period_cell_data  d ,
+    period_cell_template t
+    where d.cell_template_id=t.cell_template_id
+    and t.project_id=#{projectId,jdbcType=VARCHAR}
+    and t.period =#{period,jdbcType=INTEGER}
+    and t.row_name like concat ("%",#{rowName,jdbcType=VARCHAR},"%")
+    </select>
+
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js

@@ -82,7 +82,7 @@
                         $scope.ledgerCurrencyCodeFirst = itemFirst.ledgerCurrencyCode;
                         $scope.ledgerStatusFirst = itemFirst.status;
                         //TODO
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                     $scope.gridOptions.data = data.list;
                     $scope.queryIncomeInvoiceItemResult.pageInfo = data;

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

@@ -105,7 +105,7 @@
                     if(data.size>0){
                         $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                         $scope.status = data.list[0].status;
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                 }
             });

atms-web/src/main/webapp/ping.html

-Server is Running
+Server is  Running
\ No newline at end of file