CIT数据预览-日记账。试算平衡表相关功能

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

+package pwc.taxtech.atms.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.CitJournalAdjustDto;
+import pwc.taxtech.atms.dpo.CitTrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.*;
+import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.dd.*;
+import pwc.taxtech.atms.service.impl.CitDataPreviewServiceImpl;
+import pwc.taxtech.atms.service.impl.DataPreviewSerivceImpl;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.UUID;
+
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+/**
+ * @author zhikai.z.wei
+ */
+@RestController
+@RequestMapping("/api/v1/citDataPreview/")
+public class CitDataPreviewController extends BaseController {
+
+    @Autowired
+    private CitDataPreviewServiceImpl citDataPreviewService;
+
+    @PostMapping("getJournalMergeData")
+    public PageInfo<CitJournalAdjustDto> getJournalMergeData(@RequestBody CitJournalAdjustDto citJournalAdjustDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citJournalAdjustDto)));
+        return citDataPreviewService.getJournalMergeData(citJournalAdjustDto);
+    }
+
+    @RequestMapping(value = "exportJournalMergeData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportJournalMergeData(@RequestBody CitJournalAdjustDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportJournalMergeData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+
+    @PostMapping("getTbGeneVerData")
+    public PageInfo<CitTrialBalanceDto> getTbGeneVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
+        return citDataPreviewService.getTbGeneVerData(citTrialBalanceDto);
+    }
+
+    @RequestMapping(value = "exportTbGeneVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportTbGeneVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportTbGeneVerData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载试算平衡表生成版-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+    @PostMapping("getTbMappingVerData")
+    public PageInfo<CitTrialBalanceDto> getTbMappingVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
+        return citDataPreviewService.getTbMappingVerData(citTrialBalanceDto);
+    }
+
+
+    @RequestMapping(value = "exportTbMappingVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportTbMappingVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportTbMappingVerData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+}
+
+

atms-api/src/main/java/pwc/taxtech/atms/dto/CitDataImportLogDto.java

@@ -36,6 +36,27 @@ public class CitDataImportLogDto implements Serializable {
      * @mbg.generated
      */
     private String organizationId;
+    /**
+     * Database Column Remarks:
+     *   项目Id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
 
     /**
      * Database Column Remarks:
@@ -214,6 +235,8 @@ public class CitDataImportLogDto implements Serializable {
      */
     private Date updateTime;
 
+    private String createTimeStr;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table data_import_log
@@ -270,6 +293,22 @@ public class CitDataImportLogDto implements Serializable {
         this.organizationId = organizationId == null ? null : organizationId.trim();
     }
 
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column data_import_log.type
@@ -582,6 +621,14 @@ public class CitDataImportLogDto implements Serializable {
         this.createTime = createTime;
     }
 
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column data_import_log.update_time

atms-api/src/main/java/pwc/taxtech/atms/dto/CitJournalAdjustDto.java

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+import pwc.taxtech.atms.entity.CitJournalEntryAdjust;
+
+/**
+ * @author zhikai.z.wei
+ */
+public class CitJournalAdjustDto extends CitJournalEntryAdjust {
+    private PagingDto pageInfo;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    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;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/CitTrialBalanceExportDto.java

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.thirdparty.ExcelCell;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table journal_entry
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class CitTrialBalanceExportDto {
+
+    private Long id;
+
+    private String organizationId;
+
+    private String projectId;
+
+    @ExcelCell(index=1)
+    private String accountCode;
+
+    @ExcelCell(index=2)
+    private String accountDescription;
+
+    @ExcelCell(index=3)
+    private Integer accountPeriod;
+
+    @ExcelCell(index=4)
+    private BigDecimal debitAmount;
+
+    @ExcelCell(index=5)
+    private BigDecimal creditAmount;
+
+    @ExcelCell(index=5)
+    private BigDecimal beginningBalance;
+
+    @ExcelCell(index=6)
+    private BigDecimal endingBalance;
+
+    @ExcelCell(index=7)
+    private String attribute;
+
+    @ExcelCell(index=8)
+    private String createdBy;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getAccountDescription() {
+        return accountDescription;
+    }
+
+    public void setAccountDescription(String accountDescription) {
+        this.accountDescription = accountDescription;
+    }
+
+    public Integer getAccountPeriod() {
+        return accountPeriod;
+    }
+
+    public void setAccountPeriod(Integer accountPeriod) {
+        this.accountPeriod = accountPeriod;
+    }
+
+    public BigDecimal getDebitAmount() {
+        return debitAmount;
+    }
+
+    public void setDebitAmount(BigDecimal debitAmount) {
+        this.debitAmount = debitAmount;
+    }
+
+    public BigDecimal getCreditAmount() {
+        return creditAmount;
+    }
+
+    public void setCreditAmount(BigDecimal creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
+    public BigDecimal getBeginningBalance() {
+        return beginningBalance;
+    }
+
+    public void setBeginningBalance(BigDecimal beginningBalance) {
+        this.beginningBalance = beginningBalance;
+    }
+
+    public BigDecimal getEndingBalance() {
+        return endingBalance;
+    }
+
+    public void setEndingBalance(BigDecimal endingBalance) {
+        this.endingBalance = endingBalance;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "CitTrialBalanceExportDto{" +
+                "id=" + id +
+                ", organizationId='" + organizationId + '\'' +
+                ", projectId='" + projectId + '\'' +
+                ", accountCode='" + accountCode + '\'' +
+                ", accountDescription='" + accountDescription + '\'' +
+                ", accountPeriod=" + accountPeriod +
+                ", debitAmount=" + debitAmount +
+                ", creditAmount='" + creditAmount + '\'' +
+                ", beginningBalance='" + beginningBalance + '\'' +
+                ", endingBalance='" + endingBalance + '\'' +
+                ", attribute='" + attribute + '\'' +
+                ", createdBy='" + createdBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dto/JournalMergeExportDto.java

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.thirdparty.ExcelCell;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table journal_entry
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class JournalMergeExportDto {
+
+    private Long id;
+
+    private String organizationId;
+
+    private String projectId;
+
+    @ExcelCell(index=1)
+    private String approvalStatus;
+
+    @ExcelCell(index=2)
+    private String postedStatus;
+
+    @ExcelCell(index=3)
+    private Date accountingPeriod;
+
+    @ExcelCell(index=4)
+    private Date accountingDate;
+
+    @ExcelCell(index=5)
+    private String journalSource;
+
+    @ExcelCell(index=5)
+    private String category;
+
+    @ExcelCell(index=6)
+    private String name;
+
+    @ExcelCell(index=7)
+    private String voucherNum;
+
+    @ExcelCell(index=8)
+    private String description;
+
+    @ExcelCell(index=9)
+    private String OrgCode;
+
+    @ExcelCell(index=10)
+    private String SubjectCode;
+
+    @ExcelCell(index=11)
+    private String OrgName;
+
+    @ExcelCell(index=12)
+    private String SubjectName;
+
+    @ExcelCell(index=13)
+    private BigDecimal accountedDr;
+
+    @ExcelCell(index=14)
+    private BigDecimal accountedCr;
+
+    @ExcelCell(index=15)
+    private String createdBy;
+
+    @ExcelCell(index=16)
+    private Date createdDate;
+
+    @ExcelCell(index=17)
+    private String lateUpdatedBy;
+
+    @ExcelCell(index=18)
+    private Date lateUpdatedDate;
+
+    @ExcelCell(index=19)
+    private Integer period;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getPostedStatus() {
+        return postedStatus;
+    }
+
+    public void setPostedStatus(String postedStatus) {
+        this.postedStatus = postedStatus;
+    }
+
+    public Date getAccountingPeriod() {
+        return accountingPeriod;
+    }
+
+    public void setAccountingPeriod(Date accountingPeriod) {
+        this.accountingPeriod = accountingPeriod;
+    }
+
+    public Date getAccountingDate() {
+        return accountingDate;
+    }
+
+    public void setAccountingDate(Date accountingDate) {
+        this.accountingDate = accountingDate;
+    }
+
+    public String getJournalSource() {
+        return journalSource;
+    }
+
+    public void setJournalSource(String journalSource) {
+        this.journalSource = journalSource;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVoucherNum() {
+        return voucherNum;
+    }
+
+    public void setVoucherNum(String voucherNum) {
+        this.voucherNum = voucherNum;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getOrgCode() {
+        return OrgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        OrgCode = orgCode;
+    }
+
+    public String getSubjectCode() {
+        return SubjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        SubjectCode = subjectCode;
+    }
+
+    public String getOrgName() {
+        return OrgName;
+    }
+
+    public void setOrgName(String orgName) {
+        OrgName = orgName;
+    }
+
+    public String getSubjectName() {
+        return SubjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        SubjectName = subjectName;
+    }
+
+    public BigDecimal getAccountedDr() {
+        return accountedDr;
+    }
+
+    public void setAccountedDr(BigDecimal accountedDr) {
+        this.accountedDr = accountedDr;
+    }
+
+    public BigDecimal getAccountedCr() {
+        return accountedCr;
+    }
+
+    public void setAccountedCr(BigDecimal accountedCr) {
+        this.accountedCr = accountedCr;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getLateUpdatedBy() {
+        return lateUpdatedBy;
+    }
+
+    public void setLateUpdatedBy(String lateUpdatedBy) {
+        this.lateUpdatedBy = lateUpdatedBy;
+    }
+
+    public Date getLateUpdatedDate() {
+        return lateUpdatedDate;
+    }
+
+    public void setLateUpdatedDate(Date lateUpdatedDate) {
+        this.lateUpdatedDate = lateUpdatedDate;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "JournalMergeExportDto{" +
+                "id=" + id +
+                ", organizationId='" + organizationId + '\'' +
+                ", projectId='" + projectId + '\'' +
+                ", approvalStatus='" + approvalStatus + '\'' +
+                ", postedStatus='" + postedStatus + '\'' +
+                ", accountingPeriod=" + accountingPeriod +
+                ", accountingDate=" + accountingDate +
+                ", journalSource='" + journalSource + '\'' +
+                ", category='" + category + '\'' +
+                ", name='" + name + '\'' +
+                ", voucherNum='" + voucherNum + '\'' +
+                ", description='" + description + '\'' +
+                ", OrgCode='" + OrgCode + '\'' +
+                ", SubjectCode='" + SubjectCode + '\'' +
+                ", OrgName='" + OrgName + '\'' +
+                ", SubjectName='" + SubjectName + '\'' +
+                ", accountedDr=" + accountedDr +
+                ", accountedCr=" + accountedCr +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdDate=" + createdDate +
+                ", lateUpdatedBy='" + lateUpdatedBy + '\'' +
+                ", lateUpdatedDate=" + lateUpdatedDate +
+                ", period=" + period +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}
\ No newline at end of file

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

@@ -106,7 +106,28 @@ public interface CitJournalEntryAdjustMapper extends MyMapper {
      */
     int updateByPrimaryKey(CitJournalEntryAdjust record);
 
+    /**
+     * fetch data by citJournalAdjustList
+     *
+     * @param citJournalAdjustList
+     * @return int
+     */
     int insertBatch(List<CitJournalEntryAdjust> citJournalAdjustList);
 
+    /**
+     * fetch data by period orgList
+     *
+     * @param period
+     * @param orgList
+     * @return List<CitJournalEntryAdjust>
+     */
     List<CitJournalEntryAdjust> sumAmountByCondition(@Param("period") String period, @Param("orgList") List<String> orgList);
+
+    /**
+     * fetch data by projectId
+     *
+     * @param projectId
+     * @return List<CitJournalEntryAdjust>
+     */
+    List<CitJournalEntryAdjust> getJournalMerge(String projectId);
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.dpo.CitTrialBalanceDto;
 import pwc.taxtech.atms.entity.CitTrialBalance;
 import pwc.taxtech.atms.entity.CitTrialBalanceExample;
 
@@ -107,4 +108,12 @@ public interface CitTrialBalanceMapper extends MyMapper {
     int updateByPrimaryKey(CitTrialBalance record);
 
     int insertBatch(List<CitTrialBalance> citTrialBalanceList);
+
+    /**
+     * fetch data by citTrialBalanceDto
+     *
+     * @param citTrialBalanceDto
+     * @return List<CitTrialBalanceDto>
+     */
+    List<CitTrialBalanceDto> getTbMappingData(CitTrialBalanceDto citTrialBalanceDto);
 }
\ No newline at end of file

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

+package pwc.taxtech.atms.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+import pwc.taxtech.atms.entity.CitJournalEntryAdjust;
+import pwc.taxtech.atms.entity.CitTrialBalance;
+
+/**
+ * @author zhikai.z.wei
+ */
+public class CitTrialBalanceDto extends CitTrialBalance {
+    private PagingDto pageInfo;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    private String attribute;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    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;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+}

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

@@ -33,6 +33,28 @@ public class CitDataImportLog extends BaseEntity implements Serializable {
      */
     private String organizationId;
 
+    /**
+     * Database Column Remarks:
+     *   项目Id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
     /**
      * Database Column Remarks:
      *   纳税人识别号
@@ -276,6 +298,54 @@ public class CitDataImportLog extends BaseEntity implements Serializable {
         this.organizationId = organizationId == null ? null : organizationId.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_data_import_log.project_id
+     *
+     * @return the value of cit_data_import_log.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 cit_data_import_log.project_id
+     *
+     * @param projectId the value for cit_data_import_log.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 cit_data_import_log.period
+     *
+     * @return the value of cit_data_import_log.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_data_import_log.period
+     *
+     * @param period the value for cit_data_import_log.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 cit_data_import_log.taxpayer_id_num
@@ -698,6 +768,8 @@ public class CitDataImportLog extends BaseEntity implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
         sb.append(", taxpayerIdNum=").append(taxpayerIdNum);
         sb.append(", type=").append(type);
         sb.append(", companyCode=").append(companyCode);

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

@@ -325,6 +325,136 @@ public class CitDataImportLogExample {
             return (Criteria) this;
         }
 
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
         public Criteria andTaxpayerIdNumIsNull() {
             addCriterion("taxpayer_id_num is null");
             return (Criteria) this;

atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitDataImportLogMapper.xml

@@ -8,6 +8,8 @@
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="period" jdbcType="INTEGER" property="period" />
     <result column="taxpayer_id_num" jdbcType="VARCHAR" property="taxpayerIdNum" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="company_code" jdbcType="VARCHAR" property="companyCode" />
@@ -97,9 +99,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, organization_id, taxpayer_id_num, type, company_code, company_name, file_type, 
-    period_year, tms_period_month, period_month, period_status, operator, operate_time, 
-    import_result, error_msg, record_size, display, create_time, update_time
+    id, organization_id, project_id, period, taxpayer_id_num, type, company_code, company_name, 
+    file_type, period_year, tms_period_month, period_month, period_status, operator, 
+    operate_time, import_result, error_msg, record_size, display, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitDataImportLogExample" resultMap="BaseResultMap">
     <!--
@@ -152,20 +154,22 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into cit_data_import_log (id, organization_id, taxpayer_id_num, 
-      type, company_code, company_name, 
-      file_type, period_year, tms_period_month, 
-      period_month, period_status, operator, 
-      operate_time, import_result, error_msg, 
-      record_size, display, create_time, 
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{taxpayerIdNum,jdbcType=VARCHAR}, 
-      #{type,jdbcType=TINYINT}, #{companyCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{fileType,jdbcType=VARCHAR}, #{periodYear,jdbcType=INTEGER}, #{tmsPeriodMonth,jdbcType=TINYINT}, 
-      #{periodMonth,jdbcType=TINYINT}, #{periodStatus,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, 
-      #{operateTime,jdbcType=TIMESTAMP}, #{importResult,jdbcType=BIT}, #{errorMsg,jdbcType=VARCHAR}, 
-      #{recordSize,jdbcType=INTEGER}, #{display,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into cit_data_import_log (id, organization_id, project_id, 
+      period, taxpayer_id_num, type, 
+      company_code, company_name, file_type, 
+      period_year, tms_period_month, period_month, 
+      period_status, operator, operate_time, 
+      import_result, error_msg, record_size, 
+      display, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
+      #{period,jdbcType=INTEGER}, #{taxpayerIdNum,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, 
+      #{companyCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
+      #{periodYear,jdbcType=INTEGER}, #{tmsPeriodMonth,jdbcType=TINYINT}, #{periodMonth,jdbcType=TINYINT}, 
+      #{periodStatus,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, #{operateTime,jdbcType=TIMESTAMP}, 
+      #{importResult,jdbcType=BIT}, #{errorMsg,jdbcType=VARCHAR}, #{recordSize,jdbcType=INTEGER}, 
+      #{display,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitDataImportLog">
     <!--
@@ -180,6 +184,12 @@
       <if test="organizationId != null">
         organization_id,
       </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
       <if test="taxpayerIdNum != null">
         taxpayer_id_num,
       </if>
@@ -239,6 +249,12 @@
       <if test="organizationId != null">
         #{organizationId,jdbcType=VARCHAR},
       </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
       <if test="taxpayerIdNum != null">
         #{taxpayerIdNum,jdbcType=VARCHAR},
       </if>
@@ -315,6 +331,12 @@
       <if test="record.organizationId != null">
         organization_id = #{record.organizationId,jdbcType=VARCHAR},
       </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
       <if test="record.taxpayerIdNum != null">
         taxpayer_id_num = #{record.taxpayerIdNum,jdbcType=VARCHAR},
       </if>
@@ -379,6 +401,8 @@
     update cit_data_import_log
     set id = #{record.id,jdbcType=BIGINT},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      period = #{record.period,jdbcType=INTEGER},
       taxpayer_id_num = #{record.taxpayerIdNum,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=TINYINT},
       company_code = #{record.companyCode,jdbcType=VARCHAR},
@@ -410,6 +434,12 @@
       <if test="organizationId != null">
         organization_id = #{organizationId,jdbcType=VARCHAR},
       </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
       <if test="taxpayerIdNum != null">
         taxpayer_id_num = #{taxpayerIdNum,jdbcType=VARCHAR},
       </if>
@@ -471,6 +501,8 @@
     -->
     update cit_data_import_log
     set organization_id = #{organizationId,jdbcType=VARCHAR},
+      project_id = #{projectId,jdbcType=VARCHAR},
+      period = #{period,jdbcType=INTEGER},
       taxpayer_id_num = #{taxpayerIdNum,jdbcType=VARCHAR},
       type = #{type,jdbcType=TINYINT},
       company_code = #{companyCode,jdbcType=VARCHAR},

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

@@ -187,4 +187,25 @@
         ) as jfinal
         group by jfinal.subject_code
     </select>
+
+
+    <select id="getJournalMerge" parameterType="map" resultMap="BaseResultMap">
+        select
+        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,
+        created_by, created_date, late_updated_by,
+        late_updated_date, create_time, update_time
+        from cit_journal_entry_adjust  where project_id=''
+        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
+        from journal_entry    where project_id=''
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -2,6 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.dao.CitTrialBalanceMapper">
 
+  <resultMap id="citTbDtoResultMap" type="pwc.taxtech.atms.dpo.CitTrialBalanceDto">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="date" jdbcType="TIMESTAMP" property="date" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="account_code" jdbcType="VARCHAR" property="accountCode" />
+    <result column="attribute" jdbcType="VARCHAR" property="attribute" />
+    <result column="account_description" jdbcType="VARCHAR" property="accountDescription" />
+    <result column="account_period" jdbcType="INTEGER" property="accountPeriod" />
+    <result column="debit_amount" jdbcType="DECIMAL" property="debitAmount" />
+    <result column="credit_amount" jdbcType="DECIMAL" property="creditAmount" />
+    <result column="beginning_balance" jdbcType="DECIMAL" property="beginningBalance" />
+    <result column="ending_balance" jdbcType="DECIMAL" property="endingBalance" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into cit_trial_balance
     (<include refid="Base_Column_List"/>)
@@ -83,4 +107,18 @@
     where caccount_code=#{item.accountCode} AND ctb.period=#{item.period}
   </select>
 
+  <select id="getTbMappingData" parameterType="map" resultMap="citTbDtoResultMap">
+    select
+      tb.id, tb.organization_id, tb.project_id, tb.date, tb.source, tb.period, tb.account_code, tb.account_description,
+      tb.account_period, tb.debit_amount, tb.credit_amount, tb.beginning_balance, tb.ending_balance, tb.create_by,
+      tb.create_time, tb.update_time,dam.attribute as attribute
+      from
+        cit_trial_balance tb
+      left join
+        cit_draft_account_mapping dam
+      on
+        tb.account_code=dam.acct_code
+
+  </select>
+
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -771,7 +771,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-journal-merge></cit-preview-journal-merge>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
@@ -790,7 +790,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-tb-generate-ver></cit-preview-tb-generate-ver>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
@@ -809,7 +809,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 appTranslation.load([appTranslation.cit]);
                             }
                         ],
-                        template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
+                        template: '<cit-preview-tb-mapping-ver></cit-preview-tb-mapping-ver>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),

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

@@ -76,23 +76,34 @@
     "toUpdate": "To be updated",
     "~MustBeEndOneApp": "I Must be the End One, please!",
 
-    "isRetainDifference": "保留差异",
-    "TaxAccountDifference": "税会差异",
-    "TaxDepreciation": "会计折旧",
-    "AccountDepreciation": "税务折旧",
-    "CitJournalAdjustImport": "日记账调整导入-CIT",
-    "CitBalanceSheetPrcAdjustImport": "资产负债表（单家PRC）调整导入-CIT",
-    "CitProfitPrcAdjustImport": "利润表（单家PRC）调整导入-CIT",
-    "CitTrialBalanceImport": "试算平衡表导入-CIT",
-    "CitSalaryAdvanceImport": "预提重分类数据源导入-CIT",
-    "CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",
-    "CitDraftAccountMappingImport": "底稿&科目Mapping表导入-CIT",
-    "PleaseSelectOrganization": "请选择机构！",
-    "PleaseSelectPeriod": "请选择期间！",
+    "isRetainDifference": "Is Retain Difference",
+    "TaxAccountDifference": "Tax Account Difference",
+    "TaxDepreciation": "Tax Depreciation",
+    "AccountDepreciation": "Account Depreciation",
+    "CitJournalAdjustImport": "Cit-Journal Adjust Import",
+    "CitBalanceSheetPrcAdjustImport": "Cit-Balance Sheet Prc Adjust Import",
+    "CitProfitPrcAdjustImport": "Cit-Profit Prc Adjust Import",
+    "CitTrialBalanceImport": "Cit-Trial Balance Import",
+    "CitSalaryAdvanceImport": "Cit-Salary Advance Import",
+    "CitEAMAssetsDisposalImport": "Cit-EAM Assets Disposal Import",
+    "CitDraftAccountMappingImport": "Cit-Draft Account Mapping Import",
+    "PleaseSelectOrganization": "Please Select Organization！",
+    "PleaseSelectPeriod": "Please Select Period！",
 
-    "balanceSheet": "试算平衡表",
-    "bsGenerateVer": "试算平衡生成版",
-    "bsMappingVer": "试算平衡Mapping版",
-    "salaryAdvance": "预提重分类",
-    "eamDisposal": "EAM资产处置金额记录表"
+    "balanceSheet": "Balance Sheet",
+    "bsGenerateVer": "Balance Sheet Generate Version",
+    "bsMappingVer": "Balance Sheet Mapping Version",
+    "salaryAdvance": "Salary Advance",
+    "eamDisposal": "EAM Disposal",
+    "createTime": "CreateTime",
+    "importWay": "Import Way",
+    "TrialBalanceGeneVer": "Trial Balance Generate Ver",
+    "TrialBalanceMappingVer": "Trial Balance Mapping Ver",
+    "AccountDescription": "Account Description",
+    "AccountPeriod": "Account Period",
+    "DebitAmount": "Debit Amount",
+    "CreditAmount": "Credit Amount",
+    "BeginningBalance": "Beginning Balance",
+    "EndingBalance": "Ending Balance",
+    "Attribute": "Attribute"
 }
\ No newline at end of file

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

@@ -1118,6 +1118,18 @@
     "bsMappingVer": "试算平衡Mapping版",
     "salaryAdvance": "预提重分类",
     "eamDisposal": "EAM资产处置金额记录表",
+    "createTime": "创建时间",
+    "importWay": "导入方式",
+    "TrialBalanceGeneVer": "试算平衡表生成版",
+    "TrialBalanceMappingVer": "试算平衡表Mapping版",
+    "AccountDescription": "科目说明",
+    "AccountPeriod": "期间",
+    "DebitAmount": "借方发生额",
+    "CreditAmount": "贷方发生额",
+    "BeginningBalance": "期初余额",
+    "EndingBalance": "期末余额",
+    "Attribute": "小类",
+    "eamDisposal": "EAM资产处置金额记录表",
     "organizationId" : "机构编号",
     "source" : "来源",
     "poSubjectName" : "PO主体名称",

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

+<div class="popover">
+    <div class="arrow"></div>
+    <div class="popover-content">
+        <div>
+            <table class="table table-responsive">
+                <tr>
+                    <td>
+                        <span translate="TBAccountCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment3" ng-model="queryParams.segment3" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="AccountName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment3Name" ng-model="queryParams.segment3Name" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ProfitCenterCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.segment5" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ProfitCenterName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment5Name" ng-model="queryParams.segment5Name" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ProductCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment6" ng-model="queryParams.segment6" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="TBProductName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment6Name" ng-model="queryParams.segment6Name" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="Summary"></span>
+                        <input class="form-control input-width-middle" type="text" id="description" ng-model="queryParams.description" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="IsContainsAdjustmentRecord"></span>
+                        <input class="form-control input-width-middle" type="text" id="containsAdjustmentRecord" ng-model="queryParams.containsAdjustmentRecord" />
+                    </td>
+                </tr>
+                <!--<tr>
+                    <td>
+                        <span translate="InvoiceFPLXQuery"></span>
+                        <div class="ui-select-has-border input-width-middle">
+                            <ui-select ng-model="InvoiceType.selected" search-enabled="false" style="text-align:left;" class="input-width-middle">
+                                <ui-select-match>{{$select.selected.name}}</ui-select-match>
+                                <ui-select-choices repeat="item in invoiceTypeList | propsFilter: {name: $select.search}">
+                                    <div title="{{item.name}}" ng-bind-html="item.name"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceRZJGQuery"></span>
+                        <div class="ui-select-has-border input-width-middle">
+                            <ui-select ng-model="CertificationStatus.selected" search-enabled="false" style="text-align: left; " class="input-width-middle">
+                                <ui-select-match>{{$select.selected.name}}</ui-select-match>
+                                <ui-select-choices repeat="item in cetificationResultList | propsFilter: {name: $select.search}">
+                                    <div title="{{item.name}}" ng-bind-html="item.name"></div>
+                                </ui-select-choices>
+                            </ui-select>
+                        </div>
+                    </td>
+                </tr>-->
+            </table>
+        </div>
+        <div class="row">
+            <div style="float:right;margin-right:10px;">
+                <button class="btn btn-default btn-primary" ng-click="doDataFilter('')">
+                    <span class="fa fa-chevron-down" aria-hidden="true"> </span> <span translate="Confirm"></span>
+                </button>
+                <button class="btn btn-default margin-right10" ng-click="doDataFilterReset()">
+                    <span class="fa fa-times" aria-hidden="true"> </span> <span translate="Reset"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>

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

+<div class="cit-preview-journal-merge" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 10px">
+        <button class="filter-button"
+                atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+                popover-container="body" popover-auto-hide="true" data-overwrite="true"
+                use-optimized-placement-algorithm="true"
+                data-placement="bottom"
+                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>：
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <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>
+
+    <div style="margin-bottom: 8px;margin-left: 30px">
+        {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
+        {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
+        {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
+        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+    </div>
+
+    <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
+        <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:
+        <span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+        <span ng-if="criteriaList.length>6"><br /></span>
+        <span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
+        <span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+    </div>
+
+    <div id="mainAreaDiv" class="main-area">
+        <div class="inputInvoiceGrid" ui-grid="gridOptions">
+            <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
+        </div>
+        <div class="pagination-container">
+            <span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

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

+citModule.directive('citPreviewJournalMerge', ['$log',
+    function ($log) {
+        $log.debug('citPreviewJournalMerge.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citPreviewJournalMergeController',
+            link: function ($scope, element) {
+
+            }
+        };
+    }
+]);
+
+
+

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

+@import "~/app-resources/less/theme.less";
+
+.cit-preview-journal-merge {
+    background-color: white;
+    height: 100%;
+
+    .numAmount {
+        padding: 0 3px;
+        height: 21px;
+        margin-left: 5px;
+        /* font-family: 'Arial'; */
+        font-weight: 600;
+        border-radius: 2px;
+        font-style: normal;
+        outline: none;
+        border: none;
+        min-width: 20px;
+        background-color: #DDDDDD;
+        color: #AA0000;
+    }
+
+    .top-area-wrapper {
+        height: 60px;
+        width: 98%;
+        margin: 0 20px;
+
+        .filter-button {
+            width: 30px;
+            margin-top: 16px;
+        }
+
+        .operation-wrapper {
+            margin: 15px 25px 10px 10px;
+
+            span {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .filter-popup-wrapper {
+        display: none;
+    }
+
+
+
+    .margin-left20 {
+        margin-left: 20px;
+    }
+    /*******************************************/
+    /*Filter Criteria tags:*/
+    .tag {
+        font-size: 12px;
+        padding: .3em .4em .4em;
+        margin: 0 .1em;
+
+        a {
+            color: #bbb;
+            cursor: pointer;
+            opacity: 0.6;
+            margin: 0 0 0 .3em;
+
+
+            &:hover {
+                opacity: 1.0;
+            }
+
+            .glyphicon-white {
+                color: #fff;
+                margin-bottom: 2px;
+            }
+        }
+
+        .remove {
+            vertical-align: bottom;
+            top: 0;
+        }
+    }
+    /*Filter Criteria tags:*/
+    /*******************************************/
+    .main-area {
+        height: 100%;
+        margin: 0 20px;
+
+        .watermark {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            opacity: .25;
+            font-size: 3em;
+            width: 100%;
+            text-align: center;
+            z-index: 1000;
+        }
+
+        .inputInvoiceGrid {
+            width: 100%;
+            height: calc(~'100% - 158px');
+
+            .ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
+                height: 40px;
+
+                i {
+                    display: none;
+                }
+            }
+        }
+    }
+
+
+    .form-control {
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}
+
+
+
+.popover {
+    min-width: 370px;
+    left: 119px !important;
+
+    .arrow {
+        left: 5% !important;
+    }
+}
+
+.popover-content {
+    td {
+        text-align: right;
+        padding: 6px;
+
+        span {
+            float: left;
+        }
+    }
+
+    .form-control {
+        display: inline-block;
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-small {
+        width: 100px;
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}

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

+<div class="popover">
+    <div class="popover-content">
+        <div>
+            <table class=" table table-responsive">
+                <tr>
+                    <td><span translate="AccountCode"></span></td>
+                    <td>
+                        
+                        <div class="input-group">
+                            <input class="form-control " type="text" id="accountCode" placeholder="" ng-model="filterData.accountCode">
+                            <a class="input-group-addon btn btn-sm" ng-click="popTheParentCode()"><i class="fa fa-columns" aria-hidden="true"></i></a>
+
+                            </div>
+</td>
+                </tr>
+
+                <tr>
+                    <td><span translate="AccountName"></span></td>
+                    <td><input class="form-control " type="text" id="accountName" placeholder="" ng-model="filterData.accountName"></td>
+                </tr>
+
+                <tr>
+                    <td><span translate="DebitOpeningBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right;" type="text" id="debitOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitOpeningBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitOpeningBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="CreditOpeningBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditOpeningBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditOpeningBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="AccumulatedDebitAmount"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedDebitAmountFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedDebitAmountFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedDebitAmountTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedDebitAmountTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="AccumulatedCreditAmount"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedCreditAmountFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedCreditAmountFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedCreditAmountTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedCreditAmountTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="DebitClosingBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitClosingBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitClosingBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="CreditClosingBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right;" type="text" id="creditClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditClosingBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditClosingBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+
+            </table>
+
+        </div>
+        <div class="row">
+            <div style="float:right">
+                <button class="btn btn-default btn-primary" ng-click="doDataFilter()">
+                    <span class="fa fa-chevron-down" aria-hidden="true"> </span> <span translate="Confirm"></span>
+                </button>
+
+                <button class="btn btn-default" style="margin-right:15px" type="button" ng-click="doDataFilterReset()">
+                    <span class="fa fa-times" aria-hidden="true"> </span> <span translate="Reset"></span>
+                </button>
+                
+            </div>
+        </div>
+    </div>
+</div>
+
+

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

+<div class="cit-preview-tb-generate-ver" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 10px">
+        <button class="filter-button"
+                atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+                popover-container="body" popover-auto-hide="true" data-overwrite="true"
+                use-optimized-placement-algorithm="true"
+                data-placement="bottom"
+                data-templateurl="/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver-search.html">
+            <i class="fa fa-filter" aria-hidden="true"></i>
+        </button>
+        <span translate="TrialBalanceGeneVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <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>
+
+    <div style="margin-bottom: 8px;margin-left: 30px">
+        {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
+        {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
+        {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
+        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+    </div>
+
+    <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
+        <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:
+        <span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+        <span ng-if="criteriaList.length>6"><br /></span>
+        <span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
+        <span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+    </div>
+
+    <div id="mainAreaDiv" class="main-area">
+        <div class="inputInvoiceGrid" ui-grid="gridOptions">
+            <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
+        </div>
+        <div class="pagination-container">
+            <span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

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

+citModule.directive('citPreviewTbGenerateVer', ['$log',
+    function ($log) {
+        $log.debug('citPreviewTbGenerateVer.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citPreviewTbGeneVerController',
+            link: function ($scope, element) { 
+            }
+        };
+    }
+]);
+
+
+

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

+@import "~/app-resources/less/theme.less";
+
+.cit-preview-tb-generate-ver {
+    background-color: white;
+    height: 100%;
+
+    .numAmount {
+        padding: 0 3px;
+        height: 21px;
+        margin-left: 5px;
+        /* font-family: 'Arial'; */
+        font-weight: 600;
+        border-radius: 2px;
+        font-style: normal;
+        outline: none;
+        border: none;
+        min-width: 20px;
+        background-color: #DDDDDD;
+        color: #AA0000;
+    }
+
+    .top-area-wrapper {
+        height: 60px;
+        width: 98%;
+        margin: 0 20px;
+
+        .filter-button {
+            width: 30px;
+            margin-top: 16px;
+        }
+
+        .operation-wrapper {
+            margin: 15px 25px 10px 10px;
+
+            span {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .filter-popup-wrapper {
+        display: none;
+    }
+
+
+
+    .margin-left20 {
+        margin-left: 20px;
+    }
+    /*******************************************/
+    /*Filter Criteria tags:*/
+    .tag {
+        font-size: 12px;
+        padding: .3em .4em .4em;
+        margin: 0 .1em;
+
+        a {
+            color: #bbb;
+            cursor: pointer;
+            opacity: 0.6;
+            margin: 0 0 0 .3em;
+
+
+            &:hover {
+                opacity: 1.0;
+            }
+
+            .glyphicon-white {
+                color: #fff;
+                margin-bottom: 2px;
+            }
+        }
+
+        .remove {
+            vertical-align: bottom;
+            top: 0;
+        }
+    }
+    /*Filter Criteria tags:*/
+    /*******************************************/
+    .main-area {
+        height: 100%;
+        margin: 0 20px;
+
+        .watermark {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            opacity: .25;
+            font-size: 3em;
+            width: 100%;
+            text-align: center;
+            z-index: 1000;
+        }
+
+        .inputInvoiceGrid {
+            width: 100%;
+            height: calc(~'100% - 158px');
+
+            .ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
+                height: 40px;
+
+                i {
+                    display: none;
+                }
+            }
+        }
+    }
+
+
+    .form-control {
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}
+
+
+
+.popover {
+    min-width: 370px;
+    left: 119px !important;
+
+    .arrow {
+        left: 5% !important;
+    }
+}
+
+.popover-content {
+    td {
+        text-align: right;
+        padding: 6px;
+
+        span {
+            float: left;
+        }
+    }
+
+    .form-control {
+        display: inline-block;
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-small {
+        width: 100px;
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}

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

+<div class="popover">
+    <div class="popover-content">
+        <div>
+            <table class=" table table-responsive">
+                <tr>
+                    <td><span translate="AccountCode"></span></td>
+                    <td>
+                        
+                        <div class="input-group">
+                            <input class="form-control " type="text" id="accountCode" placeholder="" ng-model="filterData.accountCode">
+                            <a class="input-group-addon btn btn-sm" ng-click="popTheParentCode()"><i class="fa fa-columns" aria-hidden="true"></i></a>
+
+                            </div>
+</td>
+                </tr>
+
+                <tr>
+                    <td><span translate="AccountName"></span></td>
+                    <td><input class="form-control " type="text" id="accountName" placeholder="" ng-model="filterData.accountName"></td>
+                </tr>
+
+                <tr>
+                    <td><span translate="DebitOpeningBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right;" type="text" id="debitOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitOpeningBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitOpeningBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="CreditOpeningBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditOpeningBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditOpeningBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="AccumulatedDebitAmount"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedDebitAmountFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedDebitAmountFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedDebitAmountTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedDebitAmountTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="AccumulatedCreditAmount"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedCreditAmountFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedCreditAmountFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="accumulatedCreditAmountTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.accumulatedCreditAmountTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="DebitClosingBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitClosingBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="debitClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.debitClosingBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><span translate="CreditClosingBalance"></span></td>
+                    <td>
+                        <div>
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right;" type="text" id="creditClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditClosingBalanceFrom">
+                            -
+                            <input class="form-control input-width-small" style="width: 115px; text-align: right; " type="text" id="creditClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);" placeholder="" ng-model="filterData.creditClosingBalanceTo">
+                        </div>
+                    </td>
+                </tr>
+
+            </table>
+
+        </div>
+        <div class="row">
+            <div style="float:right">
+                <button class="btn btn-default btn-primary" ng-click="doDataFilter()">
+                    <span class="fa fa-chevron-down" aria-hidden="true"> </span> <span translate="Confirm"></span>
+                </button>
+
+                <button class="btn btn-default" style="margin-right:15px" type="button" ng-click="doDataFilterReset()">
+                    <span class="fa fa-times" aria-hidden="true"> </span> <span translate="Reset"></span>
+                </button>
+                
+            </div>
+        </div>
+    </div>
+</div>
+
+

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

+<div class="cit-preview-tb-mapping-ver" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 10px">
+        <button class="filter-button"
+                atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+                popover-container="body" popover-auto-hide="true" data-overwrite="true"
+                use-optimized-placement-algorithm="true"
+                data-placement="bottom"
+                data-templateurl="/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver-search.html">
+            <i class="fa fa-filter" aria-hidden="true"></i>
+        </button>
+        <span translate="TrialBalanceMappingVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <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>
+
+    <div style="margin-bottom: 8px;margin-left: 30px">
+        {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
+        {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
+        {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
+        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+    </div>
+
+    <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
+        <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:
+        <span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+        <span ng-if="criteriaList.length>6"><br /></span>
+        <span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
+        <span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
+            <span title="{{criteria.fullName}}">
+                {{criteria.name}}
+            </span>
+            <a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
+        </span>
+    </div>
+
+    <div id="mainAreaDiv" class="main-area">
+        <div class="inputInvoiceGrid" ui-grid="gridOptions">
+            <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
+        </div>
+        <div class="pagination-container">
+            <span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

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

+citModule.directive('citPreviewTbMappingVer', ['$log',
+    function ($log) {
+        $log.debug('citPreviewTbMappingVer.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citPreviewTbMappingVerCon',
+            link: function ($scope, element) { 
+            }
+        };
+    }
+]);
+
+
+

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

+@import "~/app-resources/less/theme.less";
+
+.cit-preview-tb-mapping-ver {
+    background-color: white;
+    height: 100%;
+
+    .numAmount {
+        padding: 0 3px;
+        height: 21px;
+        margin-left: 5px;
+        /* font-family: 'Arial'; */
+        font-weight: 600;
+        border-radius: 2px;
+        font-style: normal;
+        outline: none;
+        border: none;
+        min-width: 20px;
+        background-color: #DDDDDD;
+        color: #AA0000;
+    }
+
+    .top-area-wrapper {
+        height: 60px;
+        width: 98%;
+        margin: 0 20px;
+
+        .filter-button {
+            width: 30px;
+            margin-top: 16px;
+        }
+
+        .operation-wrapper {
+            margin: 15px 25px 10px 10px;
+
+            span {
+                cursor: pointer;
+            }
+        }
+    }
+
+    .filter-popup-wrapper {
+        display: none;
+    }
+
+
+
+    .margin-left20 {
+        margin-left: 20px;
+    }
+    /*******************************************/
+    /*Filter Criteria tags:*/
+    .tag {
+        font-size: 12px;
+        padding: .3em .4em .4em;
+        margin: 0 .1em;
+
+        a {
+            color: #bbb;
+            cursor: pointer;
+            opacity: 0.6;
+            margin: 0 0 0 .3em;
+
+
+            &:hover {
+                opacity: 1.0;
+            }
+
+            .glyphicon-white {
+                color: #fff;
+                margin-bottom: 2px;
+            }
+        }
+
+        .remove {
+            vertical-align: bottom;
+            top: 0;
+        }
+    }
+    /*Filter Criteria tags:*/
+    /*******************************************/
+    .main-area {
+        height: 100%;
+        margin: 0 20px;
+
+        .watermark {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            opacity: .25;
+            font-size: 3em;
+            width: 100%;
+            text-align: center;
+            z-index: 1000;
+        }
+
+        .inputInvoiceGrid {
+            width: 100%;
+            height: calc(~'100% - 158px');
+
+            .ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
+                height: 40px;
+
+                i {
+                    display: none;
+                }
+            }
+        }
+    }
+
+
+    .form-control {
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}
+
+
+
+.popover {
+    min-width: 370px;
+    left: 119px !important;
+
+    .arrow {
+        left: 5% !important;
+    }
+}
+
+.popover-content {
+    td {
+        text-align: right;
+        padding: 6px;
+
+        span {
+            float: left;
+        }
+    }
+
+    .form-control {
+        display: inline-block;
+
+        &:focus {
+            border-color: transparent;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+            border: 1px solid #ccc;
+        }
+    }
+
+    .input-width-small {
+        width: 100px;
+    }
+
+    .input-width-middle {
+        width: 217px;
+    }
+}

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

@@ -247,20 +247,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -269,7 +264,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

@@ -234,20 +234,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -256,7 +251,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

@@ -233,20 +233,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -255,7 +250,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -249,20 +249,15 @@ debugger;
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -271,7 +266,7 @@ debugger;
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -242,20 +242,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -264,7 +259,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -243,20 +243,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -265,7 +260,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -245,20 +245,15 @@
                     width: '27%',
                     caption: $translate.instant('CompanyName')
                 }, {
-                    dataField: "periodYear",
+                    dataField: "period",
                     allowHeaderFiltering: false,
                     width: '5%',
-                    caption: $translate.instant('YearPeriod')
+                    caption: $translate.instant('Period')
                 }, {
-                    dataField: "periodMonth",
+                    dataField: "createTimeStr",
                     allowHeaderFiltering: false,
                     width: '10%',
-                    caption: $translate.instant('TMSPeriod')
-                }, {
-                    dataField: "periodMonth",
-                    allowHeaderFiltering: false,
-                    width: '5%',
-                    caption: $translate.instant('Period')
+                    caption: $translate.instant('createTime')
                 }, {
                     dataField: "recordSize",
                     allowHeaderFiltering: false,
@@ -267,7 +262,7 @@
                 }, {
                     dataField: "errorMsg",
                     allowHeaderFiltering: false,
-                    width: '15%',
+                    width: '20%',
                     caption: $translate.instant('Status')
                 }
                 ],