Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java

@@ -30,7 +30,7 @@ public class EbsApiServiceImplTest extends CommonIT {
     }
     @Test
     public void queryRemoteServerThenUpdateOrg(){
-        List<OrganizationQueryDto> items =new ArrayList<>();
+        List<OrganizationQueryDto> items = new ArrayList();
         for(int i=0;i<2;i++){
             OrganizationQueryDto dto = new OrganizationQueryDto();
             dto.setTaxPayerNumber("sadsafsdf3232");

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

@@ -13,6 +13,15 @@ public class ReportDto {
     private Date createTime;
     private String updater;
     private Date updateTime;
+    private Integer reportType;
+
+    public Integer getReportType() {
+        return reportType;
+    }
+
+    public void setReportType(Integer reportType) {
+        this.reportType = reportType;
+    }
 
     public String getId() {
         return id;

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

@@ -103,6 +103,7 @@
         <result column="TEMPLATE_ID" jdbcType="INTEGER" property="templateId"/>
         <result column="TEMPLATE_NAME" jdbcType="VARCHAR" property="templateName"/>
         <result column="TEMPLATE_CODE" jdbcType="VARCHAR" property="templateCode"/>
+        <result column="REPORT_TYPE" jdbcType="INTEGER" property="reportType"/>
     </resultMap>
 
     <!--TODO: 考虑项目库表迁移-->
@@ -112,13 +113,15 @@
         D.period AS PERIOD,
         C.id AS TEMPLATE_ID,
         C.name AS TEMPLATE_NAME,
-        C.code AS TEMPLATE_CODE
+        C.code AS TEMPLATE_CODE,
+        C.reportType AS REPORT_TYPE
         FROM
         (
         SELECT
         A.id as ID,
         A.name AS NAME,
-        A.code AS CODE
+        A.code AS CODE,
+        A.report_type AS reportType
         FROM
         template A
         WHERE

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -54,9 +54,11 @@ constant.payTaxTypeList = [
     {value: 2, name: '小规模纳税人'}];
 
 constant.citReportTypeList = [
-    {value: 1, name: '纳税申报表'},
-    {value: 2, name: '季度预缴表'},
-    {value: 3, name: '工作底稿'}];
+    { value: 1, name: 'TaxReturnType',orderIndex:2 },
+    { value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 3 },
+    { value: 3, name: 'WorkingPaperType', orderIndex: 1 },
+    { value: 4, name: 'DocumentListType', orderIndex: 4 },
+    { value: 5, name: 'OtherTaxes', orderIndex: 5 }];
 
 constant.cfReportTypeList = [
     {value: 1, name: '企业所得税预算'},

atms-web/src/main/webapp/app/common/utils/enums.js

@@ -129,7 +129,13 @@ commonModule.factory('enums', ['$translate', function ($translate) {
             CF: "11",
             AssetsManage: "12"
         },
-
+        reportType: {
+            taxReturn: 1,
+            prepay: 2,
+            workingPaper: 3,
+            documentList: 4,
+            others: 5
+        },
         //发票类型
         invoiceType: {
             VATInvoice: 1,

atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html

@@ -16,7 +16,7 @@
                             <a ui-sref-active="active" data-template-id="{{menu.id}}"
                                ng-class="{'active':selectedTemplateId===menu.id}"
                                ui-sref=".reportView({ id: menu.reportId, templateid: menu.id, name:menu.name,templatecode:menu.code })"
-                               ng-bind-html="::menu.name"></a>
+                               ng-bind-html="::menu.code+'_'+menu.name"></a>
                         </div>
                     </div>
                 </li>