#

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

@@ -2,10 +2,10 @@ package pwc.taxtech.atms.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import net.sf.json.JSONNull;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DateUtil;
@@ -20,20 +20,26 @@ import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.PageResultVo;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.FileUploadEnum;
+import pwc.taxtech.atms.dpo.OrgSelectDto;
 import pwc.taxtech.atms.dto.TaxDocumentDto;
 import pwc.taxtech.atms.entity.TaxDocument;
 import pwc.taxtech.atms.service.impl.DidiFileUploadService;
+import pwc.taxtech.atms.service.impl.OrganizationServiceImpl;
 import pwc.taxtech.atms.service.impl.TaxDocumentServiceImpl;
 import pwc.taxtech.atms.thirdparty.ExcelUtil;
 import pwc.taxtech.atms.vat.entity.FileUpload;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/api/v1/taxDoc")
@@ -44,12 +50,18 @@ public class TaxDocumentController {
 
     @Autowired
     private DidiFileUploadService didiFileUploadService;
+    @Autowired
+    private OrganizationServiceImpl organizationService;
     @PostMapping("selectList")
     @ResponseBody
     public PageResultVo<TaxDocument> selectTaxDocumentList(@RequestBody TaxDocumentDto taxDocumentDto) {
-        Page<TaxDocument> page = PageHelper.startPage(taxDocumentDto.getCurrentPage(), taxDocumentDto.getPageSize());
-        taxDocumentService.selectTaxDocumentList(taxDocumentDto);
-        PageInfo<TaxDocument> taxDocumentPageInfo = page.toPageInfo();
+        List<OrgSelectDto> orgList = organizationService.getMyOrgList();
+        if(CollectionUtils.isEmpty(orgList)){
+            return new PageResultVo<>();
+        }
+        PageHelper.startPage(taxDocumentDto.getCurrentPage(), taxDocumentDto.getPageSize());
+        PageInfo<TaxDocument> taxDocumentPageInfo =  new PageInfo<>(taxDocumentService.selectTaxDocumentList(taxDocumentDto,orgList.stream()
+                .map(o -> o.getId()).collect(Collectors.toList())));
         List<TaxDocument> list = taxDocumentPageInfo.getList();
         return PageResultVo.getPageResultVo(taxDocumentPageInfo, list);
     }
@@ -115,7 +127,14 @@ public class TaxDocumentController {
             headers.put("UploadTime", "上传日期");
             headers.put("Creator", "创建人");
             headers.put("Remark", "档案备注");
-            List<TaxDocument> TaxDocument = taxDocumentService.selectTaxDocumentList(taxDocumentDto);
+            List<TaxDocument> TaxDocument =null;
+                    List<OrgSelectDto> orgList = organizationService.getMyOrgList();
+            if(CollectionUtils.isEmpty(orgList)){
+                TaxDocument = new ArrayList<>();
+            }else{
+                TaxDocument = taxDocumentService.selectTaxDocumentList(taxDocumentDto,orgList.stream()
+                        .map(o -> o.getId()).collect(Collectors.toList()));
+            }
             response.setContentType("multipart/form-data");
             response.setHeader("Content-Disposition", "attachment;fileName=" + new String("taxDocument.xlsx".getBytes("GB2312"), "ISO-8859-1"));
             OutputStream ouputStream = response.getOutputStream();

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

@@ -59,8 +59,10 @@ public class TaxDocumentServiceImpl {
     @Autowired
     private OrganizationServiceImpl organizationService;
 
-    public List<TaxDocument> selectTaxDocumentList(TaxDocumentDto taxDocumentDto) {
-        List<TaxDocument> dataList = taxDocumentMapper.selectByExample(getExample(taxDocumentDto));
+
+    public List<TaxDocument> selectTaxDocumentList(TaxDocumentDto taxDocumentDto,List<String> orgIds) {
+
+        List<TaxDocument> dataList = taxDocumentMapper.selectByExample(getExample(taxDocumentDto,orgIds));
         DidiFileIUploadParam fileParam = new DidiFileIUploadParam();
         fileParam.setUuids(dataList.stream()
                 .map(o -> o.getFileUploadId()).collect(Collectors.toList()));
@@ -86,9 +88,10 @@ public class TaxDocumentServiceImpl {
      * @param taxDocumentDto
      * @return
      */
-    private TaxDocumentExample getExample(TaxDocumentDto taxDocumentDto) {
+    private TaxDocumentExample getExample(TaxDocumentDto taxDocumentDto,List<String> orgIds) {
         TaxDocumentExample example = new TaxDocumentExample();
         TaxDocumentExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdIn(orgIds);
         //档案属性 fileAttr
         if (StringUtils.isNotBlank(taxDocumentDto.getFileAttr())) {
             criteria.andFileAttrEqualTo(taxDocumentDto.getFileAttr());

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

@@ -52,19 +52,19 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
     private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType, Integer amountType, OperationEvaluationContext ec) {
 
         String queryDate = formulaContext.getYear() + (formulaContext.getPeriod() < 10 ? ("0" + formulaContext.getPeriod()) : (formulaContext.getPeriod() + ""));
-        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
-        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
-                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate);
-        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
-        if (CollectionUtils.isEmpty(typeMappingList)) {
-            return 0.0;
-        }
-        List<String> revenueTypes = typeMappingList.stream()
-                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
+//        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
+//        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
+//                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
+//                .andEndDateGreaterThanOrEqualTo(queryDate);
+//        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
+//        if (CollectionUtils.isEmpty(typeMappingList)) {
+//            return 0.0;
+//        }
+//        List<String> revenueTypes = typeMappingList.stream()
+//                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
         RevenueConfigExample configExample = new RevenueConfigExample();
         configExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId()).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate).andNameIn(revenueTypes);
+                .andEndDateGreaterThanOrEqualTo(queryDate).andNameEqualTo(revenueTypeName);
         List<RevenueConfig> configDatas = SpringContextUtil.revenueConfigMapper.selectByExample(configExample);
         if (CollectionUtils.isEmpty(configDatas)) {
             return 0.0;

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

@@ -133,11 +133,11 @@ public interface OrganizationMapper extends MyMapper {
 
     List<OrgGeneralInfoMiddleDto> selectJoinToOrgGeneralInfo();
 
-    @Select("select tb.id,tb.name from organization tb left join user_organization ta on ta.organization_id = tb.id " +
+    @Select("select tb.id,tb.name,tb.abbreviation from organization tb left join user_organization ta on ta.organization_id = tb.id " +
             "where ta.user_id = #{uid}")
     List<OrgSelectDto> getMyOrgSelectList(String uid);
 
-    @Select("select id, name from organization;")
+    @Select("select id, name,abbreviation from organization;")
     List<OrgSelectDto> getAllOrgSelectList();
 
     @Select("select tb.id,tb.code from organization tb left join user_organization ta on ta.organization_id = tb.id " +

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

@@ -3,6 +3,15 @@ package pwc.taxtech.atms.dpo;
 public class OrgSelectDto {
     private String id;
     private String name;
+    private String abbreviation;
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
 
     public String getId() {
         return this.id;

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitJournalEntryAdjust.java

@@ -787,6 +787,26 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cit_journal_entry_adjust

atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocumentExample.java

@@ -1916,72 +1916,72 @@ public class TaxDocumentExample {
         }
 
         public Criteria andEnableIsNull() {
-            addCriterion("enable is null");
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
         public Criteria andEnableIsNotNull() {
-            addCriterion("enable is not null");
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
         public Criteria andEnableEqualTo(String value) {
-            addCriterion("enable =", value, "enable");
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotEqualTo(String value) {
-            addCriterion("enable <>", value, "enable");
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThan(String value) {
-            addCriterion("enable >", value, "enable");
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThanOrEqualTo(String value) {
-            addCriterion("enable >=", value, "enable");
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThan(String value) {
-            addCriterion("enable <", value, "enable");
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThanOrEqualTo(String value) {
-            addCriterion("enable <=", value, "enable");
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLike(String value) {
-            addCriterion("enable like", value, "enable");
+            addCriterion("`enable` like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotLike(String value) {
-            addCriterion("enable not like", value, "enable");
+            addCriterion("`enable` not like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableIn(List<String> values) {
-            addCriterion("enable in", values, "enable");
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotIn(List<String> values) {
-            addCriterion("enable not in", values, "enable");
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableBetween(String value1, String value2) {
-            addCriterion("enable between", value1, value2, "enable");
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotBetween(String value1, String value2) {
-            addCriterion("enable not between", value1, value2, "enable");
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 

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

@@ -129,4 +129,6 @@ public interface InvoiceRecordMapper extends MyVatMapper {
 
     List<String> queryBillTypeGroupBy(@Param("projectId") String projectId,
                                       @Param("period") Integer period);
+
+    int clearRevenueCof(@Param("clearRevenue") boolean clearRevenue, @Param("clearModifyRevenue") boolean clearModifyRevenue,@Param("example") InvoiceRecordExample example);
 }
\ No newline at end of file

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

@@ -344,7 +344,11 @@
         id, organization_id, project_id, period, date, source, ledger_id, ledger_name, currency_code,
         status, header_id, line_num, approval_status, posted_status, account_period, accounting_date,
         journal_source, category, name, voucher_num, description, org_code, subject_code,
-        org_name, subject_name, accounted_dr, accounted_cr,
+        org_name, segment2_name, subject_name, segment4_name, segment5_name, segment6_name, segment7_name, segment8_name,
+        segment9_name, segment10_name, journal_currency_code, sob_currency_code, accounted_dr, accounted_cr,
+        entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
+        attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
+        attribute16,
         created_by, created_date, late_updated_by,
         late_updated_date, create_time, update_time,is_select
         from cit_journal_entry_adjust where project_id = #{projectId,jdbcType=VARCHAR}
@@ -360,13 +364,22 @@
         <if test="subjectName != null">
             and subject_name = #{subjectName,jdbcType=VARCHAR}
         </if>
+        <if test="periodStart!=null">
+            AND account_period &gt;= #{periodStart,jdbcType=INTEGER}
+        </if>
+        <if test="periodEnd!=null">
+            AND account_period &lt;= #{periodEnd,jdbcType=INTEGER}
+        </if>
         UNION ALL
         select
         id, organization_id, project_id, tms_period as period ,date,source, ledger_id, ledger_name, currency_code,
         status, header_id, line_num, approval_status, posted_status, period as account_period, accounting_date,
         journal_source, category, name, voucher_num, description, segment1 as org_code, segment3 as subject_code,
-        segment1_name as org_name, segment3_name as subject_name, accounted_dr, accounted_cr,
-        created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
+        segment1_name as org_name, segment2_name, segment3_name as subject_name,  segment4_name, segment5_name, segment6_name,
+        segment7_name, segment8_name, segment9_name, segment10_name, journal_currency_code, sob_currency_code,
+        accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
+        attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
+        attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
         from journal_entry where project_id = #{projectId,jdbcType=VARCHAR}
         <if test="orgCode != null">
             and segment1 = #{orgCode,jdbcType=VARCHAR}
@@ -380,6 +393,12 @@
         <if test="subjectName != null">
             and segment3_name = #{subjectName,jdbcType=VARCHAR}
         </if>
+        <if test="periodStart!=null">
+            AND period &gt;= #{periodStart,jdbcType=INTEGER}
+        </if>
+        <if test="periodEnd!=null">
+            AND period &lt;= #{periodEnd,jdbcType=INTEGER}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -139,41 +139,69 @@
           <otherwise>0,</otherwise>
         </choose>
         <choose>
-          <when test="item.checkOne != null">#{item.checkOne,jdbcType=VARCHAR},</when>
+          <when test="item.subjectCode != null">#{item.subjectCode,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.reclassifyAmount != null">#{item.reclassifyAmount,jdbcType=DECIMAL},</when>
-          <otherwise>0,</otherwise>
+          <when test="item.subjectDescription != null">#{item.subjectDescription,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.auxiliarySubject != null">#{item.auxiliarySubject,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.auxiliarySubjectDescription != null">#{item.auxiliarySubjectDescription,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.profitCenter != null">#{item.profitCenter,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.exchangeRate != null">#{item.exchangeRate,jdbcType=VARCHAR},</when>
+          <when test="item.profitCenterDescription != null">#{item.profitCenterDescription,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.ledgerId != null">#{item.ledgerId,jdbcType=VARCHAR},</when>
+          <when test="item.product != null">#{item.product,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.debitAdvanceGene != null">#{item.debitAdvanceGene,jdbcType=VARCHAR},</when>
+          <when test="item.productDescription != null">#{item.productDescription,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.creditPrepaidAccounts != null">#{item.creditPrepaidAccounts,jdbcType=VARCHAR},</when>
+          <when test="item.project != null">#{item.project,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.remark != null">#{item.remark,jdbcType=VARCHAR},</when>
+          <when test="item.projectDescription != null">#{item.projectDescription,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.company != null">#{item.company,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.companyDescription != null">#{item.companyDescription,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
           <when test="item.segment1 != null">#{item.segment1,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.segment1Description != null">#{item.segment1Description,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
         <choose>
           <when test="item.segment2 != null">#{item.segment2,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.segment2Description != null">#{item.segment2Description,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
         <choose>
           <when test="item.createdBy != null">#{item.createdBy,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>

atms-web/src/main/java/pwc/taxtech/atms/dto/ApiResultDto.java

+package pwc.taxtech.atms.dto;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ApiResultDto {
+    private int code;
+    private Object data;
+    private String message;
+
+    public static final int SUCCESS = 0; //接口成功code
+    public static final int FAILED = -1; //通用失败code
+
+    /**
+     * 返回成功
+     *
+     * @param data data
+     * @return ApiResultDto
+     */
+    public static ApiResultDto success(Object data) {
+        return new ApiResultDto(SUCCESS, data, StringUtils.EMPTY);
+    }
+
+    /**
+     * 返回成功
+     *
+     * @return ApiResultDto
+     */
+    public static ApiResultDto success() {
+        return new ApiResultDto(SUCCESS, null, StringUtils.EMPTY);
+    }
+
+    /**
+     * 返回失败
+     *
+     * @param code    fail code
+     * @param message msg
+     * @return ApiResultDto
+     */
+    public static ApiResultDto fail(int code, String message) {
+        return new ApiResultDto(code, null, message);
+    }
+
+    /**
+     * 返回失败
+     *
+     * @param message msg
+     * @return ApiResultDto
+     */
+    public static ApiResultDto fail(String message) {
+        return new ApiResultDto(FAILED, null, message);
+    }
+
+    public static ApiResultDto fail() {
+        return new ApiResultDto(FAILED, null, StringUtils.EMPTY);
+    }
+
+    public ApiResultDto() {
+    }
+
+    public ApiResultDto(int code, Object data, String message) {
+        this.code = code;
+        this.data = data;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

atms-web/src/main/java/pwc/taxtech/atms/orangeheap/controller/OrangeHeapController.java

-package pwc.taxtech.atms.orangeheap.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/OrangeHeap/tableau")
-public class OrangeHeapController {
-}

atms-web/src/main/java/pwc/taxtech/atms/orangeheap/service/OrangeHeapService.java

-package pwc.taxtech.atms.orangeheap.service;
-
-public class OrangeHeapService {
-}

atms-web/src/main/java/pwc/taxtech/atms/web/OrangeHeapConfig.java

+package pwc.taxtech.atms.web;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OrangeHeapConfig {
+    @Value("${longi_api_basic_user}")
+    private String longiApiBasicUser;
+    @Value("${longi_api_basic_pwd}")
+    private String longiApiBasicPwd;
+    @Value("${longi_api_gl_balance}")
+    private String longiApiGlBalance;
+
+    //tableau相关配置
+    @Value("${tableau_get_ticket}")
+    private String tableauGetTicket;
+    @Value("${tableau_unreturned_tax}")
+    private String tableauUnreturnedTax;
+    @Value("${tableau_tax_comparison}")
+    private String tableauTaxComparison;
+    @Value("${tableau_other_countries}")
+    private String tableauOtherCountries;
+    @Value("${tableau_cost_analysis}")
+    private String tableauCostAnalysis;
+    @Value("${tableau_profit_and_loss}")
+    private String tableauProfitAndLoss;
+    @Value("${tableau_other_domestic_data}")
+    private String tableauOtherDomesticData;
+    @Value("${tableau_doc_situation}")
+    private String tableauDocSituation;
+    @Value("${tableau_global_overview}")
+    private String tableauGlobalOverview;
+    @Value("${tableau_mexican_tax}")
+    private String tableauMexicanTax;
+    @Value("${tableau_australian_tax}")
+    private String tableauAustralianTax;
+    @Value("${tableau_brazilian_tax}")
+    private String tableauBrazilianTax;
+
+    public String getLongiApiBasicUser() {
+        return this.longiApiBasicUser;
+    }
+
+    public void setLongiApiBasicUser(String longiApiBasicUser) {
+        this.longiApiBasicUser = longiApiBasicUser;
+    }
+
+    public String getLongiApiBasicPwd() {
+        return this.longiApiBasicPwd;
+    }
+
+    public void setLongiApiBasicPwd(String longiApiBasicPwd) {
+        this.longiApiBasicPwd = longiApiBasicPwd;
+    }
+
+    public String getLongiApiGlBalance() {
+        return this.longiApiGlBalance;
+    }
+
+    public void setLongiApiGlBalance(String longiApiGlBalance) {
+        this.longiApiGlBalance = longiApiGlBalance;
+    }
+
+    public String getTableauGetTicket() {
+        return this.tableauGetTicket;
+    }
+
+    public void setTableauGetTicket(String tableauGetTicket) {
+        this.tableauGetTicket = tableauGetTicket;
+    }
+
+    public String getTableauUnreturnedTax() {
+        return this.tableauUnreturnedTax;
+    }
+
+    public void setTableauUnreturnedTax(String tableauUnreturnedTax) {
+        this.tableauUnreturnedTax = tableauUnreturnedTax;
+    }
+
+    public String getTableauTaxComparison() {
+        return this.tableauTaxComparison;
+    }
+
+    public void setTableauTaxComparison(String tableauTaxComparison) {
+        this.tableauTaxComparison = tableauTaxComparison;
+    }
+
+    public String getTableauOtherCountries() {
+        return this.tableauOtherCountries;
+    }
+
+    public void setTableauOtherCountries(String tableauOtherCountries) {
+        this.tableauOtherCountries = tableauOtherCountries;
+    }
+
+    public String getTableauCostAnalysis() {
+        return this.tableauCostAnalysis;
+    }
+
+    public void setTableauCostAnalysis(String tableauCostAnalysis) {
+        this.tableauCostAnalysis = tableauCostAnalysis;
+    }
+
+    public String getTableauProfitAndLoss() {
+        return this.tableauProfitAndLoss;
+    }
+
+    public void setTableauProfitAndLoss(String tableauProfitAndLoss) {
+        this.tableauProfitAndLoss = tableauProfitAndLoss;
+    }
+
+    public String getTableauOtherDomesticData() {
+        return this.tableauOtherDomesticData;
+    }
+
+    public void setTableauOtherDomesticData(String tableauOtherDomesticData) {
+        this.tableauOtherDomesticData = tableauOtherDomesticData;
+    }
+
+    public String getTableauDocSituation() {
+        return this.tableauDocSituation;
+    }
+
+    public void setTableauDocSituation(String tableauDocSituation) {
+        this.tableauDocSituation = tableauDocSituation;
+    }
+
+    public String getTableauGlobalOverview() {
+        return this.tableauGlobalOverview;
+    }
+
+    public void setTableauGlobalOverview(String tableauGlobalOverview) {
+        this.tableauGlobalOverview = tableauGlobalOverview;
+    }
+
+    public String getTableauMexicanTax() {
+        return this.tableauMexicanTax;
+    }
+
+    public void setTableauMexicanTax(String tableauMexicanTax) {
+        this.tableauMexicanTax = tableauMexicanTax;
+    }
+
+    public String getTableauAustralianTax() {
+        return this.tableauAustralianTax;
+    }
+
+    public void setTableauAustralianTax(String tableauAustralianTax) {
+        this.tableauAustralianTax = tableauAustralianTax;
+    }
+
+    public String getTableauBrazilianTax() {
+        return this.tableauBrazilianTax;
+    }
+
+    public void setTableauBrazilianTax(String tableauBrazilianTax) {
+        this.tableauBrazilianTax = tableauBrazilianTax;
+    }
+}
\ No newline at end of file

atms-web/src/main/java/pwc/taxtech/atms/web/controller/OrangeHeapController.java

+package pwc.taxtech.atms.web.controller;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import pwc.taxtech.atms.dto.ApiResultDto;
+import pwc.taxtech.atms.web.service.OrangeHeapService;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/OrangeHeap")
+public class OrangeHeapController {
+
+    @Resource
+    private OrangeHeapService tableauService;
+
+    @ResponseBody
+    @GetMapping("unreturnedTax")
+    public ApiResultDto getUnreturnedTax() {
+
+        return ApiResultDto.success(tableauService.getUnreturnedTax().orElse(StringUtils.EMPTY));
+    }
+
+}

atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java

+package pwc.taxtech.atms.web.service;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.web.OrangeHeapConfig;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.Optional;
+
+@Service
+public class OrangeHeapService {
+
+    @Resource
+    private OrangeHeapConfig systemConfig;
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public Optional<String> getTicket(String username) {
+        CloseableHttpClient httpClient = null;
+        try {
+            String ticketUrl = String.format(systemConfig.getTableauGetTicket(), username);
+            httpClient = HttpClients.createDefault();
+            HttpPost httpPost = new HttpPost(ticketUrl);
+            HttpResponse httpResponse = httpClient.execute(httpPost);
+            String response = IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8");
+            return StringUtils.equals(response, "-1") ? Optional.empty() : Optional.of(response);
+        } catch (Exception e) {
+            logger.error("getTicket error.", e);
+        } finally {
+            if (null != httpClient) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    logger.error("close httpClient error.", e);
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
+    public Optional<String> getUnreturnedTax() {
+//        Optional<String> optional = authUserHelper.getCurrentAuditor();
+        Optional<String> optional = Optional.of("admin");
+
+        return optional.map(s -> String.format(systemConfig.getTableauUnreturnedTax(),
+                getTicket(s).orElse(StringUtils.EMPTY)));
+    }
+
+
+}

atms-web/src/main/resources/conf.properties

@@ -14,3 +14,24 @@ get_user_info_url=${get_user_info_url}
 app_id=${app_id}
 app_key=${app_key}
 cookie.maxAgeSeconds=${cookie.maxAgeSeconds}
+
+
+# Tableau Settings
+# Longi config
+longi_api_basic_user=${longi_api_basic_user}
+longi_api_basic_pwd=${longi_api_basic_pwd}
+longi_api_gl_balance=${longi_api_gl_balance}
+
+#tableau config
+tableau_get_ticket=${tableau_get_ticket}
+tableau_unreturned_tax=${tableau_unreturned_tax}
+tableau_tax_comparison=${tableau_tax_comparison}
+tableau_other_countries=${tableau_other_countries}
+tableau_cost_analysis=${tableau_cost_analysis}
+tableau_profit_and_loss=${tableau_profit_and_loss}
+tableau_other_domestic_data=${tableau_other_domestic_data}
+tableau_doc_situation=${tableau_doc_situation}
+tableau_global_overview=${tableau_global_overview}
+tableau_mexican_tax=${tableau_mexican_tax}
+tableau_australian_tax=${tableau_australian_tax}
+tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file

atms-web/src/main/resources/conf_profile_dev.properties

@@ -12,4 +12,24 @@ check_ticket=false
 get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
 app_id=2500
 app_key=983258e7fd04d7fa0534735f7b1c33f3
-cookie.maxAgeSeconds=86400
+cookie.maxAgeSeconds=86400
\ No newline at end of file
+
+# Tableau Setting
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#tableau config
+tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
+tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-web/src/main/resources/conf_profile_pub.properties

@@ -12,4 +12,24 @@ check_ticket=true
 get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
 app_id=2500
 app_key=983258e7fd04d7fa0534735f7b1c33f3
-cookie.maxAgeSeconds=18000
+cookie.maxAgeSeconds=18000
\ No newline at end of file
+
+# Tableau Setting
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#tableau config
+tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
+tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-web/src/main/resources/conf_profile_staging.properties

@@ -13,3 +13,24 @@ check_ticket=false
 get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
 app_id=2500
 app_key=983258e7fd04d7fa0534735f7b1c33f3
+
+
+# Tableau Setting
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#tableau config
+tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
+tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-web/src/main/resources/conf_profile_uat.properties

@@ -12,4 +12,24 @@ check_ticket=true
 get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
 app_id=2500
 app_key=983258e7fd04d7fa0534735f7b1c33f3
-cookie.maxAgeSeconds=18000
+cookie.maxAgeSeconds=18000
\ No newline at end of file
+
+# Tableau Setting
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#tableau config
+tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
+tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -813,6 +813,7 @@
     "dateFormat4YearMonthDayCh": "yyyy-mm-dd",
     "RecordSize": "Record Size",
     "ExtractFile": "Extract File",
+    "ExtractTaskId": "任务ID",
     "TaxPayerIdNum": "纳税人识别号",
 
     "ExtractDistribution": "Extract Distribution",

atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json

@@ -1150,5 +1150,6 @@
     "DistributionAmount": "Distribution Amount",
     "Subtotal": "Total",
     "AssetEamMapping": "Asset Eam Mapping",
-    "ItemData": "Item Data"
+    "ItemData": "Item Data",
+    "GenerateJournalMergeAndTB": "Handle Journal"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -857,6 +857,7 @@
 
     "RecordSize": "记录条数",
     "ExtractFile": "抽取类型",
+    "ExtractTaskId": "任务ID",
     "TaxPayerIdNum": "纳税人识别号",
     "ExtractDistribution": "抽取分发",
     "Log":"日志",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -1203,7 +1203,8 @@
     "DistributionRatio": "分配比例",
     "DistributionAmount": "分配税额",
     "AssetEamMapping": "固资损失计算",
-    "ItemData": "条数据"
+    "ItemData": "条数据",
+    "GenerateJournalMergeAndTB": "处理日记账"
 
 
 

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list-search.html

-<div class="popover">
+<div class="popover-import-asset">
+    <div class="arrow"></div>
     <div class="popover-content">
         <div>
             <table class=" table table-responsive">

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -489,7 +489,7 @@
                                     { caption: $translate.instant('ResidualRate'), dataField: "residualRate", format: { type: 'percent', precision: 2 }, width: 80, allowEditing: false },
                                     { caption: $translate.instant('PerMonthDepreciationAmount'), dataField: "accountMonthDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
                                     { caption: $translate.instant('YearDepreciationAmount'), dataField: "accountYearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
-                                    { caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "accountTotalepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
+                                    { caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "accountTotalDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
                                     { caption: $translate.instant('YearEndValue'), dataField: "yearEndValue", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
                             ]
                         },

atms-web/src/main/webapp/app/cit/preview/cit-preview-balanceSheet/cit-preview-balanceSheet.less

@@ -52,7 +52,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html

@@ -8,8 +8,10 @@
                 data-templateurl="/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
-        <span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+        <span class="text-bold" translate="AccountPeriod"></span>：
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <button translate="GenerateJournalMergeAndTB" ng-click="handleJournal()"></button>
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less

@@ -127,7 +127,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less

@@ -127,7 +127,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less

@@ -127,7 +127,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less

@@ -127,7 +127,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less

@@ -125,7 +125,6 @@
 
 .popover {
     min-width: 370px;
-    left: 119px !important;
 
     .arrow {
         left: 5% !important;

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -136,9 +136,8 @@
                 showBorders: true,
                 columns: [{
                     dataField: "id",
-                    visible: false,
                     allowHeaderFiltering: false,
-                    caption: $translate.instant('id')
+                    caption: $translate.instant('ExtractTaskId')
                 }, {
                     dataField: "taxpayerIdNum",
                     width: '15%',
@@ -195,7 +194,10 @@
                         dataField: "operateTime",
                         allowHeaderFiltering: false,
                         width: '10%',
-                        caption: $translate.instant('LogOperationTime')
+                        caption: $translate.instant('LogOperationTime'),
+                        calculateCellValue: function(data) {
+                            return new Date(data).formatDateTime('yyyy-MM-dd hh:mm:ss');
+                        }
                     }
                 ],
                 onContentReady: function (e) {

atms-web/src/main/webapp/orangeweb/css/app.cf16809e.css

+.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/index.html

+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.ce388b93.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.cc3f6466.js></script><script src=js/app.ce388b93.js></script></body></html>
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/js/about.17654e8a.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
+//# sourceMappingURL=about.17654e8a.js.map
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/js/about.17654e8a.js.map

+{"version":3,"sources":["webpack:///./src/views/About.vue?12dc","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.17654e8a.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=0391505c&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file