add vat 调整表，利润表prc人工，资产负债prc人工---Ken

atms-api/src/main/java/pwc/taxtech/atms/constant/ExportTemplatePathConstant.java

@@ -13,4 +13,7 @@ public final class ExportTemplatePathConstant {
     public static final String RED_LETTER_INFO_TAB = "/vat_excel_template/red_letter_info_tab.xlsx";
     public static final String COUPA_PURCHASING_REPORT = "/vat_excel_template/coupa_purchasing_report.xlsx";
     public static final String INVOICE_DATA = "/vat_excel_template/invoice_data.xlsx";
+    public static final String ADJUSTMENT_TABLE = "/vat_excel_template/adjustment_table.xlsx";
+    public static final String PROFIT_LOSS_STATEMENT_PRC_MANUAL_REPORT = "/vat_excel_template/profit_loss_statement_prc_manual.xlsx";
+    public static final String BALANCE_SHEET_PRC_MANUAL="/vat_excel_template/balance_sheet_prc_manual.xlsx";
 }

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

@@ -6,9 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dto.vatdto.*;
-import pwc.taxtech.atms.dto.vatdto.dd.*;
 import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.dd.*;
 import pwc.taxtech.atms.service.impl.DataPreviewSerivceImpl;
+import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrc;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -37,12 +38,24 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getPLDataForDisplay(param);
     }
 
+    @PostMapping("getPLprcManualDataForDisplay")
+    public PageInfo<ProfitLossStatementPrc> getPLprcManualDataForDisplay(@RequestBody ProfitLossStatementParam param) {
+        logger.debug(String.format("利润表PRC人工导入查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getPLprcManualDataForDisplay(param);
+    }
+
     @PostMapping("getJEDataForDisplay")
     public PageInfo<JournalEntryDto> getJEDataForDisplay(@RequestBody JournalEntryParam param) {
         logger.debug(String.format("日记账查询 Condition:%s", JSON.toJSONString(param)));
         return dataPreviewSerivceImpl.getJEDataForDisplay(param);
     }
 
+    @PostMapping("getADTBDataForDisplay")
+    public PageInfo<AdjustmentTableDto> getADTBDataForDisplay(@RequestBody AdjustmentTableParam param) {
+        logger.debug(String.format("调整表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getAdjustmentTbDataForDisplay(param);
+    }
+
     @PostMapping("getCFDataForDisplay")
     public PageInfo<CashFlowDto> getCFDataForDisplay(@RequestBody CashFlowParam param) {
         logger.debug(String.format("现金流量表查询 Condition:%s", JSON.toJSONString(param)));
@@ -55,6 +68,12 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getBSDataForDisplay(param);
     }
 
+    @PostMapping("getBSprcManualDataForDisplay")
+    public PageInfo<BalanceSheetDto> getBSprcManualDataForDisplay(@RequestBody BalanceSheetParam param) {
+        logger.debug(String.format("资产负债表PRC人工导入查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getBSprcManualDataForDisplay(param);
+    }
+
     @PostMapping("getIRDataForDisplay")
     public PageInfo<InvoiceRecordDto> getIRDataForDisplay(@RequestBody InvoiceRecordParam param) {
         logger.debug(String.format("发票记录表查询 Condition:%s", JSON.toJSONString(param)));
@@ -92,6 +111,21 @@ public class DataPreviewController extends BaseController {
         dataPreviewSerivceImpl.exportCashFlowList(response, param, fileName);
     }
 
+    @RequestMapping(value = "exportADTBData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadADTBQueryData(@RequestBody AdjustmentTableParam param, HttpServletResponse response) {
+        logger.debug("enter downloadADTBQueryData");
+        String fileName="testFile";
+        dataPreviewSerivceImpl.exportAdjustmentTableList(response, param, fileName);
+    }
+
+    //资产负债prc人工导入导出
+    @RequestMapping(value = "exportBSprcManualData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadBSprcManualQueryData(@RequestBody BalanceSheetParam param, HttpServletResponse response) {
+        logger.debug("enter downloadADTBQueryData");
+        String fileName="testFile";
+        dataPreviewSerivceImpl.exportBalanceSheetPrcManualList(response, param, fileName);
+    }
+
     @RequestMapping(value = "exportTBData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void downloadTBQueryData(@RequestBody TrialBalanceParam paras, HttpServletResponse response) {
         response.setContentType("application/vnd.ms-excel;charset=utf-8");
@@ -188,6 +222,13 @@ public class DataPreviewController extends BaseController {
         }
     }
 
+    @RequestMapping(value = "exportPLprcManualData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadPLprcManualQueryData(@RequestBody ProfitLossStatementParam param, HttpServletResponse response) {
+        logger.debug("enter downloadPLprcManualQueryData");
+        String fileName="testFile";
+        dataPreviewSerivceImpl.exportProfitLossPrcManualList(response, param, fileName);
+    }
+
     @RequestMapping(value = "exportIRData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void downloadIRQueryData(@RequestBody InvoiceRecordParam param, HttpServletResponse response) {
         logger.debug("enter downloadIRQueryData");

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class AdjustmentTableParam {
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private String segment3;
+
+    private String segment3Name;
+
+    private String segment5;
+
+    private String segment5Name;
+
+    private String segment6;
+
+    private String segment6Name;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(String segment3) {
+        this.segment3 = segment3;
+    }
+
+    public String getSegment3Name() {
+        return segment3Name;
+    }
+
+    public void setSegment3Name(String segment3Name) {
+        this.segment3Name = segment3Name;
+    }
+
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment5Name() {
+        return segment5Name;
+    }
+
+    public void setSegment5Name(String segment5Name) {
+        this.segment5Name = segment5Name;
+    }
+
+    public String getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(String segment6) {
+        this.segment6 = segment6;
+    }
+
+    public String getSegment6Name() {
+        return segment6Name;
+    }
+
+    public void setSegment6Name(String segment6Name) {
+        this.segment6Name = segment6Name;
+    }
+
+}

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

+package pwc.taxtech.atms.dto.vatdto.dd;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class AdjustmentTableDto implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   项目ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * Database Column Remarks:
+     *   主体
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment1
+     *
+     * @mbg.generated
+     */
+    private String segment1;
+
+    /**
+     * Database Column Remarks:
+     *   成本中心
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment2
+     *
+     * @mbg.generated
+     */
+    private String segment2;
+
+    /**
+     * Database Column Remarks:
+     *   科目
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment3
+     *
+     * @mbg.generated
+     */
+    private String segment3;
+
+    /**
+     * Database Column Remarks:
+     *   辅助科目
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment4
+     *
+     * @mbg.generated
+     */
+    private String segment4;
+
+    /**
+     * Database Column Remarks:
+     *   利润中心
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment5
+     *
+     * @mbg.generated
+     */
+    private String segment5;
+
+    /**
+     * Database Column Remarks:
+     *   产品
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment6
+     *
+     * @mbg.generated
+     */
+    private String segment6;
+
+    /**
+     * Database Column Remarks:
+     *   项目
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment7
+     *
+     * @mbg.generated
+     */
+    private String segment7;
+
+    /**
+     * Database Column Remarks:
+     *   公司间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment8
+     *
+     * @mbg.generated
+     */
+    private String segment8;
+
+    /**
+     * Database Column Remarks:
+     *   备用1
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment9
+     *
+     * @mbg.generated
+     */
+    private String segment9;
+
+    /**
+     * Database Column Remarks:
+     *   备用2
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment10
+     *
+     * @mbg.generated
+     */
+    private String segment10;
+
+    /**
+     * Database Column Remarks:
+     *   主体说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment1_name
+     *
+     * @mbg.generated
+     */
+    private String segment1Name;
+
+    /**
+     * Database Column Remarks:
+     *   成本中心说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment2_name
+     *
+     * @mbg.generated
+     */
+    private String segment2Name;
+
+    /**
+     * Database Column Remarks:
+     *   科目说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment3_name
+     *
+     * @mbg.generated
+     */
+    private String segment3Name;
+
+    /**
+     * Database Column Remarks:
+     *   辅助科目说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment4_name
+     *
+     * @mbg.generated
+     */
+    private String segment4Name;
+
+    /**
+     * Database Column Remarks:
+     *   利润中心说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment5_name
+     *
+     * @mbg.generated
+     */
+    private String segment5Name;
+
+    /**
+     * Database Column Remarks:
+     *   产品说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment6_name
+     *
+     * @mbg.generated
+     */
+    private String segment6Name;
+
+    /**
+     * Database Column Remarks:
+     *   项目说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment7_name
+     *
+     * @mbg.generated
+     */
+    private String segment7Name;
+
+    /**
+     * Database Column Remarks:
+     *   公司间说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment8_name
+     *
+     * @mbg.generated
+     */
+    private String segment8Name;
+
+    /**
+     * Database Column Remarks:
+     *   备用1说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment9_name
+     *
+     * @mbg.generated
+     */
+    private String segment9Name;
+
+    /**
+     * Database Column Remarks:
+     *   备用2说明
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.segment10_name
+     *
+     * @mbg.generated
+     */
+    private String segment10Name;
+
+    /**
+     * Database Column Remarks:
+     *   本位币本期借方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.period_dr_beq
+     *
+     * @mbg.generated
+     */
+    private BigDecimal periodDrBeq;
+
+
+    /**
+     * 本位币借方发生额-本位币贷方发生额
+     */
+    private BigDecimal periodDrMixCr;
+
+
+
+    /**
+     * Database Column Remarks:
+     *   本位币本期贷方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.period_cr_beq
+     *
+     * @mbg.generated
+     */
+    private BigDecimal periodCrBeq;
+
+    /**
+     * Database Column Remarks:
+     *   本位币期末余额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.end_bal_beq
+     *
+     * @mbg.generated
+     */
+    private BigDecimal endBalBeq;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * Database Column Remarks:
+     *   税务系统期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column adjustment_table.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.id
+     *
+     * @return the value of adjustment_table.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.id
+     *
+     * @param id the value for adjustment_table.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.organization_id
+     *
+     * @return the value of adjustment_table.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.organization_id
+     *
+     * @param organizationId the value for adjustment_table.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.project_id
+     *
+     * @return the value of adjustment_table.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 adjustment_table.project_id
+     *
+     * @param projectId the value for adjustment_table.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 adjustment_table.period
+     *
+     * @return the value of adjustment_table.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.period
+     *
+     * @param period the value for adjustment_table.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 adjustment_table.segment1
+     *
+     * @return the value of adjustment_table.segment1
+     *
+     * @mbg.generated
+     */
+    public String getSegment1() {
+        return segment1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment1
+     *
+     * @param segment1 the value for adjustment_table.segment1
+     *
+     * @mbg.generated
+     */
+    public void setSegment1(String segment1) {
+        this.segment1 = segment1 == null ? null : segment1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment2
+     *
+     * @return the value of adjustment_table.segment2
+     *
+     * @mbg.generated
+     */
+    public String getSegment2() {
+        return segment2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment2
+     *
+     * @param segment2 the value for adjustment_table.segment2
+     *
+     * @mbg.generated
+     */
+    public void setSegment2(String segment2) {
+        this.segment2 = segment2 == null ? null : segment2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment3
+     *
+     * @return the value of adjustment_table.segment3
+     *
+     * @mbg.generated
+     */
+    public String getSegment3() {
+        return segment3;
+    }
+
+    public BigDecimal getPeriodDrMixCr() {
+        return periodDrMixCr;
+    }
+
+    public void setPeriodDrMixCr(BigDecimal periodDrMixCr) {
+        this.periodDrMixCr = periodDrMixCr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment3
+     *
+     * @param segment3 the value for adjustment_table.segment3
+     *
+     * @mbg.generated
+     */
+    public void setSegment3(String segment3) {
+        this.segment3 = segment3 == null ? null : segment3.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment4
+     *
+     * @return the value of adjustment_table.segment4
+     *
+     * @mbg.generated
+     */
+    public String getSegment4() {
+        return segment4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment4
+     *
+     * @param segment4 the value for adjustment_table.segment4
+     *
+     * @mbg.generated
+     */
+    public void setSegment4(String segment4) {
+        this.segment4 = segment4 == null ? null : segment4.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment5
+     *
+     * @return the value of adjustment_table.segment5
+     *
+     * @mbg.generated
+     */
+    public String getSegment5() {
+        return segment5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment5
+     *
+     * @param segment5 the value for adjustment_table.segment5
+     *
+     * @mbg.generated
+     */
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5 == null ? null : segment5.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment6
+     *
+     * @return the value of adjustment_table.segment6
+     *
+     * @mbg.generated
+     */
+    public String getSegment6() {
+        return segment6;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment6
+     *
+     * @param segment6 the value for adjustment_table.segment6
+     *
+     * @mbg.generated
+     */
+    public void setSegment6(String segment6) {
+        this.segment6 = segment6 == null ? null : segment6.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment7
+     *
+     * @return the value of adjustment_table.segment7
+     *
+     * @mbg.generated
+     */
+    public String getSegment7() {
+        return segment7;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment7
+     *
+     * @param segment7 the value for adjustment_table.segment7
+     *
+     * @mbg.generated
+     */
+    public void setSegment7(String segment7) {
+        this.segment7 = segment7 == null ? null : segment7.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment8
+     *
+     * @return the value of adjustment_table.segment8
+     *
+     * @mbg.generated
+     */
+    public String getSegment8() {
+        return segment8;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment8
+     *
+     * @param segment8 the value for adjustment_table.segment8
+     *
+     * @mbg.generated
+     */
+    public void setSegment8(String segment8) {
+        this.segment8 = segment8 == null ? null : segment8.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment9
+     *
+     * @return the value of adjustment_table.segment9
+     *
+     * @mbg.generated
+     */
+    public String getSegment9() {
+        return segment9;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment9
+     *
+     * @param segment9 the value for adjustment_table.segment9
+     *
+     * @mbg.generated
+     */
+    public void setSegment9(String segment9) {
+        this.segment9 = segment9 == null ? null : segment9.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment10
+     *
+     * @return the value of adjustment_table.segment10
+     *
+     * @mbg.generated
+     */
+    public String getSegment10() {
+        return segment10;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment10
+     *
+     * @param segment10 the value for adjustment_table.segment10
+     *
+     * @mbg.generated
+     */
+    public void setSegment10(String segment10) {
+        this.segment10 = segment10 == null ? null : segment10.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment1_name
+     *
+     * @return the value of adjustment_table.segment1_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment1Name() {
+        return segment1Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment1_name
+     *
+     * @param segment1Name the value for adjustment_table.segment1_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment1Name(String segment1Name) {
+        this.segment1Name = segment1Name == null ? null : segment1Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment2_name
+     *
+     * @return the value of adjustment_table.segment2_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment2Name() {
+        return segment2Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment2_name
+     *
+     * @param segment2Name the value for adjustment_table.segment2_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment2Name(String segment2Name) {
+        this.segment2Name = segment2Name == null ? null : segment2Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment3_name
+     *
+     * @return the value of adjustment_table.segment3_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment3Name() {
+        return segment3Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment3_name
+     *
+     * @param segment3Name the value for adjustment_table.segment3_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment3Name(String segment3Name) {
+        this.segment3Name = segment3Name == null ? null : segment3Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment4_name
+     *
+     * @return the value of adjustment_table.segment4_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment4Name() {
+        return segment4Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment4_name
+     *
+     * @param segment4Name the value for adjustment_table.segment4_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment4Name(String segment4Name) {
+        this.segment4Name = segment4Name == null ? null : segment4Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment5_name
+     *
+     * @return the value of adjustment_table.segment5_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment5Name() {
+        return segment5Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment5_name
+     *
+     * @param segment5Name the value for adjustment_table.segment5_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment5Name(String segment5Name) {
+        this.segment5Name = segment5Name == null ? null : segment5Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment6_name
+     *
+     * @return the value of adjustment_table.segment6_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment6Name() {
+        return segment6Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment6_name
+     *
+     * @param segment6Name the value for adjustment_table.segment6_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment6Name(String segment6Name) {
+        this.segment6Name = segment6Name == null ? null : segment6Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment7_name
+     *
+     * @return the value of adjustment_table.segment7_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment7Name() {
+        return segment7Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment7_name
+     *
+     * @param segment7Name the value for adjustment_table.segment7_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment7Name(String segment7Name) {
+        this.segment7Name = segment7Name == null ? null : segment7Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment8_name
+     *
+     * @return the value of adjustment_table.segment8_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment8Name() {
+        return segment8Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment8_name
+     *
+     * @param segment8Name the value for adjustment_table.segment8_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment8Name(String segment8Name) {
+        this.segment8Name = segment8Name == null ? null : segment8Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment9_name
+     *
+     * @return the value of adjustment_table.segment9_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment9Name() {
+        return segment9Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment9_name
+     *
+     * @param segment9Name the value for adjustment_table.segment9_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment9Name(String segment9Name) {
+        this.segment9Name = segment9Name == null ? null : segment9Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.segment10_name
+     *
+     * @return the value of adjustment_table.segment10_name
+     *
+     * @mbg.generated
+     */
+    public String getSegment10Name() {
+        return segment10Name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.segment10_name
+     *
+     * @param segment10Name the value for adjustment_table.segment10_name
+     *
+     * @mbg.generated
+     */
+    public void setSegment10Name(String segment10Name) {
+        this.segment10Name = segment10Name == null ? null : segment10Name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.period_dr_beq
+     *
+     * @return the value of adjustment_table.period_dr_beq
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getPeriodDrBeq() {
+        return periodDrBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.period_dr_beq
+     *
+     * @param periodDrBeq the value for adjustment_table.period_dr_beq
+     *
+     * @mbg.generated
+     */
+    public void setPeriodDrBeq(BigDecimal periodDrBeq) {
+        this.periodDrBeq = periodDrBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.period_cr_beq
+     *
+     * @return the value of adjustment_table.period_cr_beq
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getPeriodCrBeq() {
+        return periodCrBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.period_cr_beq
+     *
+     * @param periodCrBeq the value for adjustment_table.period_cr_beq
+     *
+     * @mbg.generated
+     */
+    public void setPeriodCrBeq(BigDecimal periodCrBeq) {
+        this.periodCrBeq = periodCrBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.end_bal_beq
+     *
+     * @return the value of adjustment_table.end_bal_beq
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getEndBalBeq() {
+        return endBalBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.end_bal_beq
+     *
+     * @param endBalBeq the value for adjustment_table.end_bal_beq
+     *
+     * @mbg.generated
+     */
+    public void setEndBalBeq(BigDecimal endBalBeq) {
+        this.endBalBeq = endBalBeq;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.create_time
+     *
+     * @return the value of adjustment_table.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.create_time
+     *
+     * @param createTime the value for adjustment_table.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.update_time
+     *
+     * @return the value of adjustment_table.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.update_time
+     *
+     * @param updateTime the value for adjustment_table.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column adjustment_table.tms_period
+     *
+     * @return the value of adjustment_table.tms_period
+     *
+     * @mbg.generated
+     */
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column adjustment_table.tms_period
+     *
+     * @param tmsPeriod the value for adjustment_table.tms_period
+     *
+     * @mbg.generated
+     */
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
+        sb.append(", segment1=").append(segment1);
+        sb.append(", segment2=").append(segment2);
+        sb.append(", segment3=").append(segment3);
+        sb.append(", segment4=").append(segment4);
+        sb.append(", segment5=").append(segment5);
+        sb.append(", segment6=").append(segment6);
+        sb.append(", segment7=").append(segment7);
+        sb.append(", segment8=").append(segment8);
+        sb.append(", segment9=").append(segment9);
+        sb.append(", segment10=").append(segment10);
+        sb.append(", segment1Name=").append(segment1Name);
+        sb.append(", segment2Name=").append(segment2Name);
+        sb.append(", segment3Name=").append(segment3Name);
+        sb.append(", segment4Name=").append(segment4Name);
+        sb.append(", segment5Name=").append(segment5Name);
+        sb.append(", segment6Name=").append(segment6Name);
+        sb.append(", segment7Name=").append(segment7Name);
+        sb.append(", segment8Name=").append(segment8Name);
+        sb.append(", segment9Name=").append(segment9Name);
+        sb.append(", segment10Name=").append(segment10Name);
+        sb.append(", periodDrBeq=").append(periodDrBeq);
+        sb.append(", periodCrBeq=").append(periodCrBeq);
+        sb.append(", endBalBeq=").append(endBalBeq);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", tmsPeriod=").append(tmsPeriod);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

+package pwc.taxtech.atms.dto.vatdto.dd;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ProfitLossStatementPrcManualDto {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   项目ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   数据日期
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.date
+     *
+     * @mbg.generated
+     */
+    private Date date;
+
+    /**
+     * Database Column Remarks:
+     *   来源
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.source
+     *
+     * @mbg.generated
+     */
+    private String source;
+
+    /**
+     * Database Column Remarks:
+     *   税务系统期间yyyymm
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
+    /**
+     * Database Column Remarks:
+     *   期间 yyyymm
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * Database Column Remarks:
+     *   关账标识
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.status
+     *
+     * @mbg.generated
+     */
+    private String status;
+
+    /**
+     * Database Column Remarks:
+     *   账套ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.ledger_id
+     *
+     * @mbg.generated
+     */
+    private String ledgerId;
+
+    /**
+     * Database Column Remarks:
+     *   账套名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.ledger_name
+     *
+     * @mbg.generated
+     */
+    private String ledgerName;
+
+    /**
+     * Database Column Remarks:
+     *   账套币种
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.ledger_currency_code
+     *
+     * @mbg.generated
+     */
+    private String ledgerCurrencyCode;
+
+    /**
+     * Database Column Remarks:
+     *   机构编码
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.entity_code
+     *
+     * @mbg.generated
+     */
+    private String entityCode;
+
+    /**
+     * Database Column Remarks:
+     *   机构名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.entity_name
+     *
+     * @mbg.generated
+     */
+    private String entityName;
+
+    /**
+     * Database Column Remarks:
+     *   主体性质
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.category
+     *
+     * @mbg.generated
+     */
+    private String category;
+
+    /**
+     * Database Column Remarks:
+     *   频度
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.frequency
+     *
+     * @mbg.generated
+     */
+    private String frequency;
+
+    /**
+     * Database Column Remarks:
+     *   项目名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.item_name
+     *
+     * @mbg.generated
+     */
+    private String itemName;
+
+    /**
+     * Database Column Remarks:
+     *   本期发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.period_amt
+     *
+     * @mbg.generated
+     */
+    private BigDecimal periodAmt;
+
+    /**
+     * Database Column Remarks:
+     *   本年累计
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.ytd_amt
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ytdAmt;
+
+    /**
+     * Database Column Remarks:
+     *   是否为国外
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.prc_flag
+     *
+     * @mbg.generated
+     */
+    private Boolean prcFlag;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table profit_loss_statement
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.id
+     *
+     * @return the value of profit_loss_statement.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.id
+     *
+     * @param id the value for profit_loss_statement.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.organization_id
+     *
+     * @return the value of profit_loss_statement.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.organization_id
+     *
+     * @param organizationId the value for profit_loss_statement.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.project_id
+     *
+     * @return the value of profit_loss_statement.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 profit_loss_statement.project_id
+     *
+     * @param projectId the value for profit_loss_statement.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 profit_loss_statement.date
+     *
+     * @return the value of profit_loss_statement.date
+     *
+     * @mbg.generated
+     */
+    public Date getDate() {
+        return date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.date
+     *
+     * @param date the value for profit_loss_statement.date
+     *
+     * @mbg.generated
+     */
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.source
+     *
+     * @return the value of profit_loss_statement.source
+     *
+     * @mbg.generated
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.source
+     *
+     * @param source the value for profit_loss_statement.source
+     *
+     * @mbg.generated
+     */
+    public void setSource(String source) {
+        this.source = source == null ? null : source.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.tms_period
+     *
+     * @return the value of profit_loss_statement.tms_period
+     *
+     * @mbg.generated
+     */
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.tms_period
+     *
+     * @param tmsPeriod the value for profit_loss_statement.tms_period
+     *
+     * @mbg.generated
+     */
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.period
+     *
+     * @return the value of profit_loss_statement.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.period
+     *
+     * @param period the value for profit_loss_statement.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 profit_loss_statement.status
+     *
+     * @return the value of profit_loss_statement.status
+     *
+     * @mbg.generated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.status
+     *
+     * @param status the value for profit_loss_statement.status
+     *
+     * @mbg.generated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.ledger_id
+     *
+     * @return the value of profit_loss_statement.ledger_id
+     *
+     * @mbg.generated
+     */
+    public String getLedgerId() {
+        return ledgerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.ledger_id
+     *
+     * @param ledgerId the value for profit_loss_statement.ledger_id
+     *
+     * @mbg.generated
+     */
+    public void setLedgerId(String ledgerId) {
+        this.ledgerId = ledgerId == null ? null : ledgerId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.ledger_name
+     *
+     * @return the value of profit_loss_statement.ledger_name
+     *
+     * @mbg.generated
+     */
+    public String getLedgerName() {
+        return ledgerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.ledger_name
+     *
+     * @param ledgerName the value for profit_loss_statement.ledger_name
+     *
+     * @mbg.generated
+     */
+    public void setLedgerName(String ledgerName) {
+        this.ledgerName = ledgerName == null ? null : ledgerName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.ledger_currency_code
+     *
+     * @return the value of profit_loss_statement.ledger_currency_code
+     *
+     * @mbg.generated
+     */
+    public String getLedgerCurrencyCode() {
+        return ledgerCurrencyCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.ledger_currency_code
+     *
+     * @param ledgerCurrencyCode the value for profit_loss_statement.ledger_currency_code
+     *
+     * @mbg.generated
+     */
+    public void setLedgerCurrencyCode(String ledgerCurrencyCode) {
+        this.ledgerCurrencyCode = ledgerCurrencyCode == null ? null : ledgerCurrencyCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.entity_code
+     *
+     * @return the value of profit_loss_statement.entity_code
+     *
+     * @mbg.generated
+     */
+    public String getEntityCode() {
+        return entityCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.entity_code
+     *
+     * @param entityCode the value for profit_loss_statement.entity_code
+     *
+     * @mbg.generated
+     */
+    public void setEntityCode(String entityCode) {
+        this.entityCode = entityCode == null ? null : entityCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.entity_name
+     *
+     * @return the value of profit_loss_statement.entity_name
+     *
+     * @mbg.generated
+     */
+    public String getEntityName() {
+        return entityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.entity_name
+     *
+     * @param entityName the value for profit_loss_statement.entity_name
+     *
+     * @mbg.generated
+     */
+    public void setEntityName(String entityName) {
+        this.entityName = entityName == null ? null : entityName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.category
+     *
+     * @return the value of profit_loss_statement.category
+     *
+     * @mbg.generated
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.category
+     *
+     * @param category the value for profit_loss_statement.category
+     *
+     * @mbg.generated
+     */
+    public void setCategory(String category) {
+        this.category = category == null ? null : category.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.frequency
+     *
+     * @return the value of profit_loss_statement.frequency
+     *
+     * @mbg.generated
+     */
+    public String getFrequency() {
+        return frequency;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.frequency
+     *
+     * @param frequency the value for profit_loss_statement.frequency
+     *
+     * @mbg.generated
+     */
+    public void setFrequency(String frequency) {
+        this.frequency = frequency == null ? null : frequency.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.item_name
+     *
+     * @return the value of profit_loss_statement.item_name
+     *
+     * @mbg.generated
+     */
+    public String getItemName() {
+        return itemName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.item_name
+     *
+     * @param itemName the value for profit_loss_statement.item_name
+     *
+     * @mbg.generated
+     */
+    public void setItemName(String itemName) {
+        this.itemName = itemName == null ? null : itemName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.period_amt
+     *
+     * @return the value of profit_loss_statement.period_amt
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getPeriodAmt() {
+        return periodAmt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.period_amt
+     *
+     * @param periodAmt the value for profit_loss_statement.period_amt
+     *
+     * @mbg.generated
+     */
+    public void setPeriodAmt(BigDecimal periodAmt) {
+        this.periodAmt = periodAmt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.ytd_amt
+     *
+     * @return the value of profit_loss_statement.ytd_amt
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getYtdAmt() {
+        return ytdAmt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.ytd_amt
+     *
+     * @param ytdAmt the value for profit_loss_statement.ytd_amt
+     *
+     * @mbg.generated
+     */
+    public void setYtdAmt(BigDecimal ytdAmt) {
+        this.ytdAmt = ytdAmt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.prc_flag
+     *
+     * @return the value of profit_loss_statement.prc_flag
+     *
+     * @mbg.generated
+     */
+    public Boolean getPrcFlag() {
+        return prcFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.prc_flag
+     *
+     * @param prcFlag the value for profit_loss_statement.prc_flag
+     *
+     * @mbg.generated
+     */
+    public void setPrcFlag(Boolean prcFlag) {
+        this.prcFlag = prcFlag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.create_time
+     *
+     * @return the value of profit_loss_statement.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.create_time
+     *
+     * @param createTime the value for profit_loss_statement.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.update_time
+     *
+     * @return the value of profit_loss_statement.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.update_time
+     *
+     * @param updateTime the value for profit_loss_statement.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.task_id
+     *
+     * @return the value of profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.task_id
+     *
+     * @param taskId the value for profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table profit_loss_statement
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", date=").append(date);
+        sb.append(", source=").append(source);
+        sb.append(", tmsPeriod=").append(tmsPeriod);
+        sb.append(", period=").append(period);
+        sb.append(", status=").append(status);
+        sb.append(", ledgerId=").append(ledgerId);
+        sb.append(", ledgerName=").append(ledgerName);
+        sb.append(", ledgerCurrencyCode=").append(ledgerCurrencyCode);
+        sb.append(", entityCode=").append(entityCode);
+        sb.append(", entityName=").append(entityName);
+        sb.append(", category=").append(category);
+        sb.append(", frequency=").append(frequency);
+        sb.append(", itemName=").append(itemName);
+        sb.append(", periodAmt=").append(periodAmt);
+        sb.append(", ytdAmt=").append(ytdAmt);
+        sb.append(", prcFlag=").append(prcFlag);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
+        sb.append("]");
+        return sb.toString();
+    }
+
+}

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

+package pwc.taxtech.atms.dto.vatdto.excelheader;
+
+public class ProfitLossHeader {
+    private String companyNameCn;
+    private String companyNameEn;
+    private String entityCode;
+    private Integer periodStart;
+    private Integer periodEnd;
+    private String ledgerName;
+    private String ledgerCurrencyCode;
+    private String status;
+
+    public String getEntityCode() {
+        return entityCode;
+    }
+
+    public void setEntityCode(String entityCode) {
+        this.entityCode = entityCode;
+    }
+
+    public String getCompanyNameCn() {
+        return companyNameCn;
+    }
+
+    public void setCompanyNameCn(String companyNameCn) {
+        this.companyNameCn = companyNameCn;
+    }
+
+    public String getCompanyNameEn() {
+        return companyNameEn;
+    }
+
+    public void setCompanyNameEn(String companyNameEn) {
+        this.companyNameEn = companyNameEn;
+    }
+
+    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 getLedgerName() {
+        return ledgerName;
+    }
+
+    public void setLedgerName(String ledgerName) {
+        this.ledgerName = ledgerName;
+    }
+
+    public String getLedgerCurrencyCode() {
+        return ledgerCurrencyCode;
+    }
+
+    public void setLedgerCurrencyCode(String ledgerCurrencyCode) {
+        this.ledgerCurrencyCode = ledgerCurrencyCode;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

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

@@ -10,24 +10,27 @@ import pwc.taxtech.atms.constant.CountTypeConstant;
 import pwc.taxtech.atms.constant.ExportTemplatePathConstant;
 import pwc.taxtech.atms.dao.OrganizationMapper;
 import pwc.taxtech.atms.dto.vatdto.*;
-import pwc.taxtech.atms.dto.vatdto.dd.*;
 import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.dd.*;
 import pwc.taxtech.atms.dto.vatdto.excelheader.CashFlowHeader;
 import pwc.taxtech.atms.dto.vatdto.excelheader.CertifiedInvoicesListHeader;
+import pwc.taxtech.atms.dto.vatdto.excelheader.ProfitLossHeader;
 import pwc.taxtech.atms.entity.Organization;
 import pwc.taxtech.atms.exception.ServiceException;
 import pwc.taxtech.atms.thirdparty.ExcelUtil;
 import pwc.taxtech.atms.vat.dao.*;
-import pwc.taxtech.atms.vat.dpo.*;
 import pwc.taxtech.atms.vat.dpo.TrialBalanceCondition;
+import pwc.taxtech.atms.vat.dpo.*;
 import pwc.taxtech.atms.vat.entity.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Auther: Gary J Li
@@ -43,12 +46,18 @@ public class DataPreviewSerivceImpl extends BaseService {
     @Resource
     private ProfitLossStatementPrcMapper profitLossStatementPrcMapper;
 
+    @Resource
+    private ProfitLossStatementPrcManualMapper profitLossStatementPrcManualMapper;
+
     @Resource
     private JournalEntryMapper journalEntryMapper;
 
     @Resource
     private BalanceSheetPrcMapper balanceSheetPrcMapper;
 
+    @Resource
+    private BalanceSheetPrcManualMapper balanceSheetPrcManualMapper;
+
     @Resource
     private CashFlowMapper cashFlowMapper;
 
@@ -70,6 +79,9 @@ public class DataPreviewSerivceImpl extends BaseService {
     @Resource
     private OrganizationMapper organizationMapper;
 
+    @Resource
+    private AdjustmentTableMapper adjustmentTableMapper;
+
     @Resource
     private CommonDocumentHelper commonDocumentHelper;
 
@@ -115,6 +127,27 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    public PageInfo<ProfitLossStatementPrc> getPLprcManualDataForDisplay(ProfitLossStatementParam param) {
+
+        ProfitLossStatementCondition condition = beanUtil.copyProperties(param, new ProfitLossStatementCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        List<ProfitLossStatementPrc> profitLossStatements = profitLossStatementPrcManualMapper.selectByCondition1(condition);
+        //List<ProfitLossStatementPrcManualDto> profitLossDtos = Lists.newArrayList();
+
+//        profitLossStatements.forEach(pl -> {
+//            ProfitLossStatementPrcManualDto profitLossDto = new ProfitLossStatementPrcManualDto();
+//            beanUtil.copyProperties(pl, profitLossDto);
+//            profitLossDtos.add(profitLossDto);
+//        });
+
+        PageInfo<ProfitLossStatementPrc> pageInfo =new PageInfo<>(profitLossStatements);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
     public PageInfo<CashFlowDto> getCFDataForDisplay(CashFlowParam param) {
         CashFlowCondition condition = new CashFlowCondition();
         beanUtil.copyProperties(param, condition);
@@ -135,9 +168,30 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    public PageInfo<AdjustmentTableDto> getAdjustmentTbDataForDisplay(AdjustmentTableParam param) {
+
+        AdjustmentTableCondition condition = beanUtil.copyProperties(param, new AdjustmentTableCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        List<AdjustmentTable> adjustmentTables = adjustmentTableMapper.selectByCondition(condition);
+        List<AdjustmentTableDto> adjustmentTableDtos = Lists.newArrayList();
+
+        adjustmentTables.forEach(a -> {
+            AdjustmentTableDto adjustmentTableDto = new AdjustmentTableDto();
+            beanUtil.copyProperties(a, adjustmentTableDto);
+            adjustmentTableDtos.add(adjustmentTableDto);
+        });
+
+        PageInfo<AdjustmentTableDto> pageInfo =new PageInfo<>(adjustmentTableDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
     public HttpServletResponse exportCashFlowList(HttpServletResponse response, CashFlowParam param, String fileName) {
         //Boolean isEn = StringUtils.equals(language, "en-us");
-        logger.debug("start export input invoice list to excel");
+        logger.debug("start export CashFlow list to excel");
         //String excelTemplatePathInClassPath = "/vat_excel_template/cash_flow"+(isEn?"":"_cn") + ".xlsx";
         String excelTemplatePathInClassPath = ExportTemplatePathConstant.CASH_FLOW;
         CashFlowCondition condition = new CashFlowCondition();
@@ -171,6 +225,97 @@ public class DataPreviewSerivceImpl extends BaseService {
         return null;
     }
 
+    public HttpServletResponse exportAdjustmentTableList(HttpServletResponse response, AdjustmentTableParam param, String fileName) {
+        //Boolean isEn = StringUtils.equals(language, "en-us");
+        logger.debug("start export AdjustmentTable list to excel");
+        //String excelTemplatePathInClassPath = "/vat_excel_template/cash_flow"+(isEn?"":"_cn") + ".xlsx";
+        String excelTemplatePathInClassPath = ExportTemplatePathConstant.ADJUSTMENT_TABLE;
+        AdjustmentTableCondition condition = new AdjustmentTableCondition();
+        beanUtil.copyProperties(param, condition);
+        PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+        List<AdjustmentTable> adjustmentTables = adjustmentTableMapper.selectByCondition(condition);
+        List<AdjustmentTableDto> adjustmentTableDtos = Lists.newArrayList();
+        adjustmentTables.forEach(a -> {
+            AdjustmentTableDto adjustmentTableDto = new AdjustmentTableDto();
+            beanUtil.copyProperties(a, adjustmentTableDto);
+            adjustmentTableDtos.add(adjustmentTableDto);
+        });
+
+        OutputStream outputStream = commonDocumentHelper.toXlsxFileUsingJxls(null, adjustmentTableDtos, excelTemplatePathInClassPath);
+
+        try {
+            return responseMessageBuilder.getDownloadTmpResponseMessage(response, outputStream, fileName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(e.getMessage());
+        }
+        return null;
+    }
+
+    public HttpServletResponse exportBalanceSheetPrcManualList(HttpServletResponse response, BalanceSheetParam param, String fileName) {
+        logger.debug("start export BalanceSheetPrcManual list to excel");
+        String excelTemplatePathInClassPath = ExportTemplatePathConstant.BALANCE_SHEET_PRC_MANUAL;
+        BalanceSheetCondition condition = new BalanceSheetCondition();
+        beanUtil.copyProperties(param, condition);
+        List<BalanceSheetPrc> balanceSheets = balanceSheetPrcManualMapper.selectByCondition1(condition);
+        List<BalanceSheetExportDto> exportDtos = Lists.newArrayList();
+        balanceSheets.forEach(id -> {
+            BalanceSheetExportDto exportDto = beanUtil.copyProperties(id, new BalanceSheetExportDto());
+            exportDtos.add(exportDto);
+        });
+        ProfitLossHeader header=new ProfitLossHeader();
+        if(balanceSheets.size()>0){
+            Organization org = organizationMapper.selectByPrimaryKey(param.getOrgId());
+            header.setCompanyNameCn(org.getName());
+            header.setPeriodStart(param.getPeriodStart());
+            header.setPeriodEnd(param.getPeriodEnd());
+            header.setEntityCode(balanceSheets.get(0).getEntityCode());
+            header.setLedgerName(balanceSheets.get(0).getLedgerName());
+            header.setLedgerCurrencyCode(balanceSheets.get(0).getLedgerCurrencyCode());
+        }
+        OutputStream outputStream = commonDocumentHelper.toXlsxFileUsingJxls(header, exportDtos, excelTemplatePathInClassPath);
+
+        try {
+            return responseMessageBuilder.getDownloadTmpResponseMessage(response, outputStream, fileName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(e.getMessage());
+        }
+        return null;
+    }
+
+    public HttpServletResponse exportProfitLossPrcManualList(HttpServletResponse response, ProfitLossStatementParam param, String fileName) {
+        logger.debug("start export ProfitLossPRCManual list to excel");
+        String excelTemplatePathInClassPath = ExportTemplatePathConstant.PROFIT_LOSS_STATEMENT_PRC_MANUAL_REPORT;
+        ProfitLossStatementCondition condition = new ProfitLossStatementCondition();
+        beanUtil.copyProperties(param, condition);
+        List<ProfitLossStatementPrc> profitLossStatements = profitLossStatementPrcManualMapper.selectByCondition1(condition);
+        //List<ProfitLossStatementExportDto> exportDtos = Lists.newArrayList();
+//        profitLossStatements.forEach(id -> {
+//            ProfitLossStatementExportDto exportDto = beanUtil.copyProperties(id, new ProfitLossStatementExportDto());
+//            exportDtos.add(exportDto);
+//        });
+        ProfitLossHeader header=new ProfitLossHeader();
+        if(profitLossStatements.size()>0){
+            Organization org = organizationMapper.selectByPrimaryKey(param.getOrgId());
+            header.setCompanyNameCn(org.getName());
+            header.setPeriodStart(param.getPeriodStart());
+            header.setPeriodEnd(param.getPeriodEnd());
+            header.setEntityCode(profitLossStatements.get(0).getEntityCode());
+            header.setLedgerName(profitLossStatements.get(0).getLedgerName());
+            header.setLedgerCurrencyCode(profitLossStatements.get(0).getLedgerCurrencyCode());
+        }
+        OutputStream outputStream = commonDocumentHelper.toXlsxFileUsingJxls(header, profitLossStatements, excelTemplatePathInClassPath);
+
+        try {
+            return responseMessageBuilder.getDownloadTmpResponseMessage(response, outputStream, fileName);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(e.getMessage());
+        }
+        return null;
+    }
+
     public PageInfo<JournalEntryDto> getJEDataForDisplay(JournalEntryParam param) {
 
         JournalEntryCondition condition = beanUtil.copyProperties(param, new JournalEntryCondition());
@@ -213,6 +358,27 @@ public class DataPreviewSerivceImpl extends BaseService {
         return pageInfo;
     }
 
+    public PageInfo<BalanceSheetDto> getBSprcManualDataForDisplay(BalanceSheetParam param) {
+
+        BalanceSheetCondition condition = beanUtil.copyProperties(param, new BalanceSheetCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        List<BalanceSheetPrc> bsPrcList = balanceSheetPrcManualMapper.selectByCondition1(condition);
+        List<BalanceSheetDto> balanceSheetDtos = Lists.newArrayList();
+
+        bsPrcList.forEach(bs -> {
+            BalanceSheetDto balanceSheetDto = new BalanceSheetDto();
+            beanUtil.copyProperties(bs, balanceSheetDto);
+            balanceSheetDtos.add(balanceSheetDto);
+        });
+
+        PageInfo<BalanceSheetDto> pageInfo =new PageInfo<>(balanceSheetDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
     public PageInfo<InvoiceRecordDto> getIRDataForDisplay(InvoiceRecordParam param) {
 
         InvoiceRecordCondition condition = beanUtil.copyProperties(param, new InvoiceRecordCondition());
@@ -360,6 +526,8 @@ public class DataPreviewSerivceImpl extends BaseService {
         }
     }
 
+
+
     public int getJEDownloadFilePath(JournalEntryParam param, OutputStream os) {
         try {
             JournalEntryCondition condition = new JournalEntryCondition();

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

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.dpo.AdjustmentTableCondition;
 import pwc.taxtech.atms.vat.entity.AdjustmentTable;
 import pwc.taxtech.atms.vat.entity.AdjustmentTableExample;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface AdjustmentTableMapper extends MyVatMapper {
     /**
@@ -112,4 +113,6 @@ public interface AdjustmentTableMapper extends MyVatMapper {
 
     List<AdjustmentTable> selectBeforeAdjustData(Map<String,Object> map1);
 
+    List<AdjustmentTable> selectByCondition(@Param("adCondition") AdjustmentTableCondition adjustmentTableCondition);
+
 }
\ No newline at end of file

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

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.BalanceSheet;
 import pwc.taxtech.atms.vat.entity.BalanceSheetPrc;
 import pwc.taxtech.atms.vat.entity.BalanceSheetPrcExample;
 
+import java.util.List;
+
 @Mapper
 public interface BalanceSheetPrcManualMapper extends MyVatMapper {
     /**
@@ -110,5 +111,7 @@ public interface BalanceSheetPrcManualMapper extends MyVatMapper {
 
     List<BalanceSheet> selectByCondition(@Param("bsCondition") BalanceSheetCondition condition);
 
+    List<BalanceSheetPrc> selectByCondition1(@Param("bsCondition") BalanceSheetCondition condition);
+
     int insertBatch(List<BalanceSheet> bls);
 }
\ No newline at end of file

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

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.ProfitLossStatement;
 import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrc;
 import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrcExample;
 
+import java.util.List;
+
 @Mapper
 public interface ProfitLossStatementPrcManualMapper extends MyVatMapper {
     /**
@@ -110,5 +111,8 @@ public interface ProfitLossStatementPrcManualMapper extends MyVatMapper {
 
     List<ProfitLossStatement> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition);
 
+    //无时间区间条件查询
+    List<ProfitLossStatementPrc> selectByCondition1(@Param("plCondition") ProfitLossStatementCondition condition);
+
     int insertBatch(List<ProfitLossStatement> pls);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/AdjustmentTableCondition.java

+package pwc.taxtech.atms.vat.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class AdjustmentTableCondition {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private String segment3;
+
+    private String segment3Name;
+
+    private String segment5;
+
+    private String segment5Name;
+
+    private String segment6;
+
+    private String segment6Name;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(String segment3) {
+        this.segment3 = segment3;
+    }
+
+    public String getSegment3Name() {
+        return segment3Name;
+    }
+
+    public void setSegment3Name(String segment3Name) {
+        this.segment3Name = segment3Name;
+    }
+
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment5Name() {
+        return segment5Name;
+    }
+
+    public void setSegment5Name(String segment5Name) {
+        this.segment5Name = segment5Name;
+    }
+
+    public String getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(String segment6) {
+        this.segment6 = segment6;
+    }
+
+    public String getSegment6Name() {
+        return segment6Name;
+    }
+
+    public void setSegment6Name(String segment6Name) {
+        this.segment6Name = segment6Name;
+    }
+
+}

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

@@ -714,4 +714,13 @@ WHERE
 
   </select>
 
+  <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.AdjustmentTableCondition" resultMap="BaseResultMap">
+    SELECT
+    ad.*
+    FROM
+    adjustment_table ad
+    WHERE
+    <include refid="QueryCondition"/>
+  </select>
+
 </mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.vat.dao.AdjustmentTableMapper">
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.orgId)">
+      AND organization_id= #{adCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment3)">
+      AND segment3= #{adCondition.segment3,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment3Name)">
+      AND segment3_name= #{adCondition.segment3Name,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment5)">
+      AND segment5= #{adCondition.segment5,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment5Name)">
+      AND segment5_name= #{adCondition.segment5Name,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment6)">
+      AND segment6= #{adCondition.segment6,jdbcType=VARCHAR}
+    </if>
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(adCondition.segment6Name)">
+      AND segment6_name= #{adCondition.segment6Name,jdbcType=VARCHAR}
+    </if>
+    <if test="adCondition.periodStart!=null">
+      AND tms_period = #{adCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    order by update_time desc
+  </sql>
 
   <insert id="insertBatch" parameterType="java.util.List">
     insert into adjustment_table

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

@@ -24,6 +24,25 @@
     <include refid="QueryCondition"/>
   </select>
 
+  <sql id="QueryCondition1">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(bsCondition.orgId)">
+      AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="bsCondition.periodStart!=null">
+      AND tms_period = #{bsCondition.periodStart,jdbcType=INTEGER}
+    </if>
+  </sql>
+
+  <select id="selectByCondition1" parameterType="pwc.taxtech.atms.vat.dpo.BalanceSheetCondition" resultMap="BaseResultMap">
+    SELECT
+    bs.*
+    FROM
+    balance_sheet_prc_manual bs
+    WHERE
+    <include refid="QueryCondition1"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into balance_sheet_prc_manual
     (<include refid="Base_Column_List"/>)

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

@@ -24,6 +24,25 @@
     <include refid="QueryCondition"/>
   </select>
 
+
+  <sql id="QueryCondition1">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(plCondition.orgId)">
+      AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="plCondition.periodStart!=null">
+      AND tms_period = #{plCondition.periodStart,jdbcType=INTEGER}
+    </if>
+  </sql>
+  <select id="selectByCondition1" parameterType="pwc.taxtech.atms.vat.dpo.ProfitLossStatementCondition" resultMap="BaseResultMap">
+    SELECT
+    pl.*
+    FROM
+    profit_loss_statement_prc_manual pl
+    WHERE
+    <include refid="QueryCondition1"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into profit_loss_statement_prc_manual
     (<include refid="Base_Column_List"/>)

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

@@ -818,6 +818,23 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				sticky: true
 			});
 
+			$stateProvider.state({
+				name: 'vat.previewData.profitLossPrcManual',
+				url: '/profitLossPrcManual',
+				views: {
+					'@vat.previewData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-preview-profit-loss-prc-manual></vat-preview-profit-loss-prc-manual>'
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
+
 			$stateProvider.state({
 				name: 'vat.previewData.profitLoss',
 				url: '/profitLoss',
@@ -902,6 +919,23 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 				sticky: true
 			});
 
+			$stateProvider.state({
+				name: 'vat.previewData.offBalanceSheetPrcManual',
+				url: '/offBalanceSheetPrcManual',
+				views: {
+					'@vat.previewData': {
+						controller: ['$scope', '$stateParams', 'appTranslation',
+							function ($scope, $stateParams, appTranslation) {
+								appTranslation.load([appTranslation.vat]);
+							}],
+						template: '<vat-preview-off-balance-sheet-prc-manual></vat-preview-off-balance-sheet>'
+					}
+				},
+				resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
+				deepStateRedirect: true,
+				sticky: true
+			});
+
 			$stateProvider.state({
 				name: 'vat.previewData.offBalanceSheet',
 				url: '/offBalanceSheet',

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

@@ -1510,8 +1510,11 @@
   "Alternate1Description": "Alternate 1 Description",
   "Alternate2Description": "Alternate 2 Description",
   "YYYY-MM": "YYYY-MM",
+  "CurrentPeriodDebitBal":"Current Period DebitBal",
+  "CurrentPeriodCreditBal":"Current Period CreditBal",
   "profitLoss": "Profit Statement",
   "profitLossPRC": "Profit Statement PRC",
+  "profitLossPRCManual": "Profit Statement PRC Manual",
   "ProfitLossTitle": "Profit Statement",
   "CurrentPeriodAmount": "Current Period Amount",
   "ThisYearAccumulatedAmount": "This Year Accumulated Amount",
@@ -1519,6 +1522,7 @@
   "directMethodCashFlowStatement": "Direct Method Cash Flow Statement",
   "offBalanceSheet": "Balance Sheet",
   "offBalanceSheetPRC": "Balance Sheet PRC",
+  "offBalanceSheetPRCManual": "Balance Sheet PRC Manual",
   "OffBalanceSheetTitle": "Balance sheet",
   "InitialBalance": "Beginning Balance",
   "journal": "Journal Entry",

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

@@ -1995,9 +1995,13 @@
     "Alternate1Description": "备用1说明",
     "Alternate2Description": "备用2说明",
     "YYYY-MM": "YYYY-MM",
+    "CurrentPeriodDebitBal":"本期借方发生额",
+    "CurrentPeriodCreditBal":"本期贷方发生额",
+    
 
     "profitLoss": "利润表",
     "profitLossPRC": "利润表PRC",
+    "profitLossPRCManual": "利润表PRC人工导入",
     "ProfitLossTitle": "利润表",
     "CurrentPeriodAmount": "本期发生额",
     "ThisYearAccumulatedAmount": "本年累计",
@@ -2010,6 +2014,7 @@
 
     "offBalanceSheet" : "资产负债表",
     "offBalanceSheetPRC": "资产负债表PRC",
+    "offBalanceSheetPRCManual": "资产负债表PRC人工导入",
 
     "OffBalanceSheetTitle" : "资产负债表",
     "InitialBalance" : "年初余额",

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

@@ -501,6 +501,12 @@ constant.vatPermission = {
         },
         invoiceData: {
             queryCode: '02.002.020'
+        },
+        profitLossPrcManual: {
+            queryCode: '02.002.021'
+        },
+        offBalanceSheetPrcManual: {
+            queryCode: '02.002.022'
         }
     },
     dataManage: {

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

@@ -198,12 +198,37 @@
                 FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
             });
         },
+        getADTBDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getADTBDataForDisplay', queryParams, apiConfig.createVat());
+        },
+        //服务器导出
+        initExportATData: function (queryParm, fileName) {
+            var thisConfig = apiConfig.create();
+            thisConfig.responseType = "arraybuffer";
+            return $http.post('/dataPreview/exportADTBData/get', queryParm, thisConfig).then(function (response) {
+                var data = new Blob([response.data], {type: response.headers('Content-Type')});
+                FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'_'+vatSessionService.project.name+'.xlsx');
+            });
+        },
         getPLDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getPLDataForDisplay', queryParams, apiConfig.createVat());
         },
         initExportPLData: function (queryParams) {
             return $http.post('/dataPreview/exportPLData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
         },
+        //利润表prc人工导入
+        getPLprcManualDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getPLprcManualDataForDisplay', queryParams, apiConfig.createVat());
+        },
+        //服务器导出 利润表prc人工
+        initExportPLprcManualData: function (queryParm, fileName) {
+            var thisConfig = apiConfig.create();
+            thisConfig.responseType = "arraybuffer";
+            return $http.post('/dataPreview/exportPLprcManualData/get', queryParm, thisConfig).then(function (response) {
+                var data = new Blob([response.data], {type: response.headers('Content-Type')});
+                FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'_'+vatSessionService.project.name+'.xlsx');
+            });
+        },
         getJEDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getJEDataForDisplay', queryParams, apiConfig.createVat());
         },
@@ -216,6 +241,19 @@
         initExportBSData: function (queryParams) {
             return $http.post('/dataPreview/exportBSData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
         },
+        //资产负债表prc人工导入
+        getBSprcManualDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getBSprcManualDataForDisplay', queryParams, apiConfig.createVat());
+        },
+        //服务器导出 资产负债表prc人工
+        initExportBSprcManualData: function (queryParm, fileName) {
+            var thisConfig = apiConfig.create();
+            thisConfig.responseType = "arraybuffer";
+            return $http.post('/dataPreview/exportBSprcManualData/get', queryParm, thisConfig).then(function (response) {
+                var data = new Blob([response.data], {type: response.headers('Content-Type')});
+                FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'_'+vatSessionService.project.name+'.xlsx');
+            });
+        },
         getIRDataForDisplay: function (queryParams) {
             return $http.post('/dataPreview/getIRDataForDisplay', queryParams, apiConfig.createVat());
         },

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -36,9 +36,21 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
                 name: 'journal', permission: constant.vatPermission.dataPreview.journal.queryCode,
                 text: $translate.instant('journal'), icon: 'fa fa-file-text-o', show: true
             },
+            {
+                name: 'adjustmentTab', permission: constant.vatPermission.dataPreview.adjustmentTab.queryCode,
+                text: $translate.instant('adjustmentTable'), icon: 'fa fa-file-text-o', show: true
+            },
             {
                 name: 'cashFlow', permission: constant.vatPermission.dataPreview.cashFlow.queryCode,
                 text: $translate.instant('cashFlow'), icon: 'fa fa-file-text-o', show: true
+            },
+            {
+                name: 'profitLossPrcManual', permission: constant.vatPermission.dataPreview.profitLossPrcManual.queryCode,
+                text: $translate.instant('profitLossPRCManual'), icon: 'fa fa-file-text-o', show: true
+            },
+            {
+                name: 'offBalanceSheetPrcManual', permission: constant.vatPermission.dataPreview.offBalanceSheetPrcManual.queryCode,
+                text: $translate.instant('offBalanceSheetPRCManual'), icon: 'fa fa-file-text-o', show: true
             },
              {
                 name: 'invoiceRecord', permission: constant.vatPermission.dataPreview.invoiceRecord.queryCode,
@@ -59,10 +71,6 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
              {
                 name: 'invoiceData', permission: constant.vatPermission.dataPreview.invoiceData.queryCode,
                 text: $translate.instant('invoiceData'), icon: 'fa fa-file-text-o', show: true
-            },
-             {
-                name: 'adjustmentTab', permission: constant.vatPermission.dataPreview.adjustmentTab.queryCode,
-                text: $translate.instant('adjustmentTable'), icon: 'fa fa-file-text-o', show: false
             },
              {
                 name: 'quarterlyOwnersEquityChangeTab', permission: constant.vatPermission.dataPreview.quarterlyOwnersEquityChangeTable.queryCode,

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab-search.html

@@ -5,60 +5,38 @@
             <table class="table table-responsive">
                 <tr>
                     <td>
-                        <span translate="BillingContent"></span>
-                        <input class="form-control input-width-small" id="certificationDateStart" ng-model="queryParams.certificationDateStart" />&nbsp;-&nbsp;
-                        <input class="form-control input-width-small" id="certificationDateEnd" ng-model="queryParams.certificationDateEnd" />
+                        <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="ApplicationSector"></span>
-                        <input class="form-control input-width-middle" type="text" id="invoiceCode" ng-model="queryParams.invoiceCode" />
+                        <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="ApplicationSector"></span>
-                        <input class="form-control input-width-middle" type="text" id="invoiceNumber" ng-model="queryParams.invoiceNumber" />
+                        <span translate="ProfitCenterCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment2" ng-model="queryParams.segment2" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span translate="InvoiceCode"></span>
-                        <input class="form-control input-width-middle" type="text" id="sellerTaxNumber" ng-model="queryParams.sellerTaxNumber" />
+                        <span translate="ProfitCenterName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment2Name" ng-model="queryParams.segment2Name" />
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span translate="InvoiceNumber"></span>
-                        <input class="form-control input-width-small" type="text" id="amountStart" ng-model="queryParams.amountStart" onkeyup="PWC.inputNumberFormat(this);" />&nbsp;-&nbsp;
-                        <input class="form-control input-width-small" type="text" id="amountEnd" ng-model="queryParams.amountEnd" onkeyup="PWC.inputNumberFormat(this);" />
+                        <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="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>
+                        <span translate="TBProductName"></span>
+                        <input class="form-control input-width-middle" type="text" id="segment6Name" ng-model="queryParams.segment6Name" />
                     </td>
                 </tr>
             </table>

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js

-vatModule.controller('VatPreviewAdjustmentTabController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
-    function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
+vatModule.controller('VatPreviewAdjustmentTabController', ['$rootScope','$scope','$filter','$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
+    function ($rootScope,$scope,$filter, $log,$translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
         'use strict';
 
         $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
         $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
         $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
-        $scope.startMonth = vatSessionService.month;
-        $scope.endMonth = vatSessionService.month;
+        $scope.startMonth =vatSessionService.year+''+vatSessionService.month;
+        //$scope.endMonth = vatSessionService.year+''+vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
         $scope.pageSize = constant.vatPagesize;
 
+        $scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
+        $scope.dateFormatMomth = $translate.instant('dateFormat4YearMonth');
+        $scope.viewMode = 1;
+
         var minDate = [1, vatSessionService.project.year];
         // var minDate = moment().startOf('month').subtract(0, 'months');
         var maxDate = [12, vatSessionService.project.year];
@@ -18,14 +22,6 @@
             [vatSessionService.month, vatSessionService.project.year],
             [vatSessionService.month, vatSessionService.project.year]];
 
-        //发票类型
-        var invoiceTypeEnum = {
-            VATInvoice: $translate.instant('VATInvoice'),
-            FreightTransport: $translate.instant('FreightTransport'),
-            MotorVehicle: $translate.instant('MotorVehicle'),
-            AgriculturalProduct: $translate.instant('AgriculturalProduct')
-        };
-
         $scope.monthList = [$translate.instant('Month01'),
                             $translate.instant('Month02'),
                             $translate.instant('Month03'),
@@ -40,127 +36,88 @@
                             $translate.instant('Month12')
         ];
 
-        //认证结果
-        $scope.cetificationResultList = [
-            { id: 999, name: $translate.instant('AllTheItems') },
-            { id: 1, name: $translate.instant('CertificationPass') },
-            { id: 2, name: $translate.instant('CertificationNotPass') }
-        ];
-
-        //发票类型
-        $scope.invoiceTypeList = [
-            { id: 999, name: $translate.instant('AllTheItems') },
-            { id: enums.invoiceType.VATInvoice, name: $translate.instant('VATInvoice') },
-            { id: enums.invoiceType.FreightTransport, name: $translate.instant('FreightTransport') },
-            { id: enums.invoiceType.MotorVehicle, name: $translate.instant('MotorVehicle') },
-            { id: enums.invoiceType.AgriculturalProduct, name: $translate.instant('AgriculturalProduct') }
-        ];
-
-
-        $scope.InvoiceType = {};
-        $scope.CertificationStatus = {};
-
         //初始化期间
         var initPeriods = function () {
-            var curMonth = new Date().getMonth() + 1;
 
+            var curMonth = new Date().getMonth() + 1;
 
             $scope.queryParams = {
                 pageInfo: {},
                 periodStart: '',
-                periodEnd: '',
-                certificationDateStart: null,
-                certificationDateEnd: null,
-                invoiceCode: '',
-                invoiceNumber: '',
-                sellerTaxNumber: '',
-                amountStart: null,
-                amountEnd: null,
-                invoiceType: null,
-                taxAmountStart: null,
-                taxAmountEnd: null,
-                certificationStatus: null
+                //periodEnd: '',
+                orgId: '',
+                segment3 : null,
+                segment3Name : null,
+                segment5 : null,
+                segment5Name : null,
+                segment6 : null,
+                segment6Name : null,
             };
         };
 
-        var countTotal = function(){
-            $scope.queryParams.pageInfo = {
-                totalCount: -1,
-                pageIndex: 1,
-                pageSize: -1,
-                totalPage: 0,
-            };
-            vatPreviewService.queryInputInvoiceAllList($scope.queryParams).success(function (data) {
-                if (data) {
-                    var totalMoneyAmount = 0;
-                    var totalTaxAmount = 0;
-                    _.each(data, function (x) {
-                        totalMoneyAmount = totalMoneyAmount + parseFloat(x.hjje.replace(/,/g, ""));
-                        totalTaxAmount = totalTaxAmount + parseFloat(x.hjse.replace(/,/g, ""));
-                    })
-                    $scope.totalMoneyAmount = totalMoneyAmount.toLocaleString();
-                    $scope.totalTaxAmount = totalTaxAmount.toLocaleString();
-                }
-            });
-        };
-
         //从数据库中load数据
-        var loadIncomeInvoiceItemDataFromDB = function (pageIndex) {
-            initIncomeInvoiceItemPagination();
-
-            $scope.curIncomeInvoiceItemPage = pageIndex;
+        var loadTrialBalanceDataFromDB = function (pageIndex) {
+            initTrialBalancePagination();
+            $scope.curTrialBalancePage = pageIndex;
 
             //初始化查询信息
             $scope.queryParams.pageInfo = {
-                totalCount: $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount,
+                totalCount: $scope.queryTrialBalanceResult.pageInfo.totalCount,
                 pageIndex: pageIndex,
-                pageSize: $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize,
-                totalPage: 0,
+                pageSize: $scope.queryTrialBalanceResult.pageInfo.pageSize,
+                totalPage: 0
             };
 
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
 
-            vatPreviewService.queryInputInvoiceList($scope.queryParams).success(function (data) {
+            $scope.getDataFromDatabase($scope.queryParams);
+        };
+
+        $scope.getDataFromDatabase = function (queryParams){
+            vatPreviewService.getADTBDataForDisplay(queryParams).success(function (data) {
                 if (data) {
                     // minDate = data.
                     var index = 1;
                     data.list.forEach(function (v) {
                         v.index = index++;
-                        v.amount = PWC.round(parseFloat(v.hjje.replace(/,/g, "")), 2);
-                        v.taxAmount = PWC.round(parseFloat(v.hjse.replace(/,/g, "")), 2);
                     });
                     $scope.gridOptions.data = data.list;
-                    $scope.queryIncomeInvoiceItemResult.pageInfo = data;
-                    computeIncomeInvoiceItemPage();
+                    $scope.queryTrialBalanceResult.pageInfo = data;
+                    computeTrialBalancePage();
+                    if(data.size>0){
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                    }
                 }
             });
         };
 
+
         //点击任意一页加载数据事件
         var loadIncomeInvoiceDataByPage = function (pageIndex) {
-            loadIncomeInvoiceItemDataFromDB(pageIndex);
+            loadTrialBalanceDataFromDB(pageIndex);
         };
 
         //计算页数，创建分页栏
-        var computeIncomeInvoiceItemPage = function () {
+        var computeTrialBalancePage = function () {
 
-            if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
+            if ($scope.queryTrialBalanceResult.pageInfo && $scope.queryTrialBalanceResult.pageInfo.total > 0) {
 
-                var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.pageSize);
-                totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
+                var totalPage = parseInt($scope.queryTrialBalanceResult.pageInfo.total / $scope.pageSize);
+                totalPage = $scope.queryTrialBalanceResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
 
                 //计算本页记录数
-                if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
-                    $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.pageSize;
+                if ($scope.queryTrialBalanceResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryTrialBalanceResult.pageInfo.total % $scope.pageSize;
                 }
                 else {
                     $scope.curPageItemCount = $scope.pageSize;
                 }
 
-                $scope.queryIncomeInvoiceItemResult.pageInfo.totalPage = totalPage;
+                $scope.queryTrialBalanceResult.pageInfo.totalPage = totalPage;
 
                 var createPage = $("#totalInvoicePage").createPage({
                     pageCount: totalPage,
-                    current: $scope.curIncomeInvoiceItemPage,
+                    current: $scope.curTrialBalancePage,
                     backFn: function (p) {
                         //单击回调方法，p是当前页码
                         loadIncomeInvoiceDataByPage(p);
@@ -173,7 +130,7 @@
                 $scope.curPageItemCount = 0;
                 var createPage = $("#totalInvoicePage").createPage({
                     pageCount: 0,
-                    current: $scope.curIncomeInvoiceItemPage,
+                    current: $scope.curTrialBalancePage,
                     backFn: function (p) {
                         //单击回调方法，p是当前页码
                         loadIncomeInvoiceDataByPage(p);
@@ -185,25 +142,25 @@
         };
 
         //初始化分页信息
-        var initIncomeInvoiceItemPagination = function () {
-            $scope.queryIncomeInvoiceItemResult = {
+        var initTrialBalancePagination = function () {
+            $scope.queryTrialBalanceResult = {
                 list: [],
                 pageInfo: {
                     totalCount: -1,
                     pageIndex: 1,
                     pageSize: constant.pagesize,
-                    totalPage: 0,
+                    totalPage: 0
                 }
-            }
+            };
 
-            $scope.curIncomeInvoiceItemPage = 1;
+            $scope.curTrialBalancePage = 1;
         };
 
         //将选择了的查询条件显示在grid上方
         var doDataFilter = function (removeData) {
-            if ($scope.queryParams.periodStart > $scope.queryParams.periodEnd) {
-                $scope.queryParams.periodEnd = $scope.queryParams.periodStart;
-            }
+            // if ($scope.queryParams.periodStart > $scope.queryParams.periodEnd) {
+            //     $scope.queryParams.periodEnd = $scope.queryParams.periodStart;
+            // }
 
             //设置需要去掉的查询条件的值为空
             if (!PWC.isNullOrEmpty(removeData)) {
@@ -211,229 +168,27 @@
                 removeItem.forEach(function (v) {
                     $scope.queryParams[v] = null;
 
-                    //如果去掉了发票代码的查询条件，则将查询条件设置为''，因为是字符串，设置为null会导致查询结果错误
-                    if ($scope.queryParams.invoiceCode === null) {
-                        $scope.queryParams.invoiceCode = '';
+                    if ($scope.queryParams.segment3 === null) {
+                        $scope.queryParams.segment3 = '';
                     }
-                    //如果去掉了发票号码的查询条件，则将查询条件设置为''，因为是字符串，设置为null会导致查询结果错误
-                    if ($scope.queryParams.invoiceNumber === null) {
-                        $scope.queryParams.invoiceNumber = '';
+                    if ($scope.queryParams.segment3Name === null) {
+                        $scope.queryParams.segment3Name = '';
                     }
-                    //如果去掉了供货方税号的查询条件，则将查询条件设置为''，因为是字符串，设置为null会导致查询结果错误
-                    if ($scope.queryParams.sellerTaxNumber === null) {
-                        $scope.queryParams.sellerTaxNumber = '';
+                    if ($scope.queryParams.segment5 === null) {
+                        $scope.queryParams.segment5 = '';
                     }
-
-
-                    if ($scope.queryParams.invoiceType === null) {
-                        $scope.InvoiceType.selected = undefined;
+                    if ($scope.queryParams.segment5Name === null) {
+                        $scope.queryParams.segment5Name = '';
                     }
-
-                    if ($scope.queryParams.certificationStatus === null) {
-                        $scope.CertificationStatus.selected = undefined;
+                    if ($scope.queryParams.segment6 === null) {
+                        $scope.queryParams.segment6 = '';
+                    }
+                    if ($scope.queryParams.segment6Name === null) {
+                        $scope.queryParams.segment6Name = '';
                     }
                 });
             }
-
-            //设置发票类型和认证结果
-            if ($scope.InvoiceType.selected !== undefined)
-                $scope.queryParams.invoiceType = $scope.InvoiceType.selected.id;
-            else
-                $scope.queryParams.invoiceType = null;
-            if ($scope.CertificationStatus.selected !== undefined)
-                $scope.queryParams.certificationStatus = $scope.CertificationStatus.selected.id;
-            else
-                $scope.queryParams.certificationStatus = null;
-
-            // 将查询条件加入到grid上方
-            var crits = $scope.queryParams;
-
-            //定义查询条件数组用于存放已选的查询条件
-            $scope.criteriaList = [];
-
-            var crit = [];
-
-            //认证日期
-            if (!PWC.isNullOrEmpty(crits.certificationDateStart) && !PWC.isNullOrEmpty(crits.certificationDateEnd)) {
-                if (new Date(crits.certificationDateStart.replace(/[\.-]/g, '/')) > new Date(crits.certificationDateEnd.replace(/[\.-]/g, '/'))) {
-                    $scope.criteriaList = [];
-                    SweetAlert.warning($translate.instant('InvoiceDateQueryError'));
-                    return;
-                }
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateStart + "-" + crits.certificationDateEnd;;
-                crit.fullName = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateStart + "-" + crits.certificationDateEnd;
-                crit.valueFrom = crits.certificationDateStart;
-                crit.valueTo = crits.certificationDateEnd;
-                crit.propertyName = "certificationDateStart|certificationDateEnd";
-
-                $scope.criteriaList.push(crit);
-            } else if (!PWC.isNullOrEmpty(crits.certificationDateStart) && PWC.isNullOrEmpty(crits.invoiceDateEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateStart + $translate.instant('After');
-                crit.fullName = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateStart + $translate.instant('After');
-                crit.valueFrom = crits.certificationDateStart;
-                crit.valueTo = crits.certificationDateEnd;
-                crit.propertyName = "certificationDateStart|certificationDateEnd";
-
-                $scope.criteriaList.push(crit);
-            }
-            else if (PWC.isNullOrEmpty(crits.certificationDateStart) && !PWC.isNullOrEmpty(crits.certificationDateEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateEnd + $translate.instant('Before');
-                crit.fullName = $translate.instant('InvoiceRZRQQuery') + crits.certificationDateEnd + $translate.instant('Before');
-                crit.valueFrom = crits.certificationDateStart;
-                crit.valueTo = crits.certificationDateEnd;
-                crit.propertyName = "certificationDateStart|certificationDateEnd";
-                $scope.criteriaList.push(crit);
-            }
-
-
-            //发票代码
-            if (!PWC.isNullOrEmpty(crits.invoiceCode)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceFPDMQuery') + PWC.limitString(crits.invoiceCode, 10);
-                crit.fullName = $translate.instant('InvoiceFPDMQuery') + crits.invoiceCode;
-                crit.valueFrom = crits.invoiceCode;
-                crit.propertyName = "invoiceCode";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            //发票号码
-            if (!PWC.isNullOrEmpty(crits.invoiceNumber)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceFPHMQuery') + PWC.limitString(crits.invoiceNumber, 10);
-                crit.fullName = $translate.instant('InvoiceFPHMQuery') + crits.invoiceNumber;
-                crit.valueFrom = crits.invoiceNumber;
-                crit.propertyName = "invoiceNumber";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            //销方识别号
-            if (!PWC.isNullOrEmpty(crits.sellerTaxNumber)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceGHFSHQuery') + PWC.limitString(crits.sellerTaxNumber, 10);
-                crit.fullName = $translate.instant('InvoiceGHFSHQuery') + crits.sellerTaxNumber;
-                crit.valueFrom = crits.sellerTaxNumber;
-                crit.propertyName = "sellerTaxNumber";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            //金额
-            if (!PWC.isNullOrEmpty(crits.amountStart) && !PWC.isNullOrEmpty(crits.amountEnd)) {
-                if (Number(crits.amountStart) > Number(crits.amountEnd)) {
-                    SweetAlert.warning($translate.instant('AmountQueryError'));
-                    return;
-                }
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceJEQuery') + PWC.limitString(crits.amountStart, 5) + ' - ' + PWC.limitString(crits.amountEnd, 5);
-                crit.fullName = $translate.instant('InvoiceJEQuery') + crits.amountStart + ' - ' + crits.amountEnd;
-                crit.valueFrom = crits.amountStart;
-                crit.valueTo = crits.amountEnd;
-                crit.propertyName = "amountStart|amountEnd";
-                $scope.criteriaList.push(crit);
-            }
-            else if (!PWC.isNullOrEmpty(crits.amountStart) && PWC.isNullOrEmpty(crits.amountEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceJEQuery') + PWC.limitString(crits.amountStart, 5) + $translate.instant('MoreThan');
-                crit.fullName = $translate.instant('InvoiceJEQuery') + crits.amountStart + $translate.instant('MoreThan');
-                crit.valueFrom = crits.amountStart;
-                crit.valueTo = crits.amountEnd;
-                crit.propertyName = "amountStart|amountEnd";
-                $scope.criteriaList.push(crit);
-            }
-            else if (PWC.isNullOrEmpty(crits.amountStart) && !PWC.isNullOrEmpty(crits.amountEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceJEQuery') + PWC.limitString(crits.amountEnd, 5) + $translate.instant('LessThan');
-                crit.fullName = $translate.instant('InvoiceJEQuery') + crits.amountEnd + $translate.instant('LessThan');
-                crit.valueFrom = crits.amountStart;
-                crit.valueTo = crits.amountEnd;
-                crit.propertyName = "amountStart|amountEnd";
-                $scope.criteriaList.push(crit);
-            }
-
-
-            //税额
-            if (!PWC.isNullOrEmpty(crits.taxAmountStart) && !PWC.isNullOrEmpty(crits.taxAmountEnd)) {
-                if (Number(crits.taxAmountStart) > Number(crits.taxAmountEnd)) {
-                    SweetAlert.warning($translate.instant('TaxAmountQueryError'));
-                    return;
-                }
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceSEQuery') + PWC.limitString(crits.taxAmountStart, 5) + ' - ' + PWC.limitString(crits.taxAmountEnd, 5);
-                crit.fullName = $translate.instant('InvoiceSEQuery') + crits.taxAmountStart + ' - ' + crits.taxAmountEnd;
-                crit.valueFrom = crits.taxAmountStart;
-                crit.valueTo = crits.taxAmountEnd;
-                crit.propertyName = "taxAmountStart|taxAmountEnd";
-
-                $scope.criteriaList.push(crit);
-            }
-            else if (!PWC.isNullOrEmpty(crits.taxAmountStart) && PWC.isNullOrEmpty(crits.taxAmountEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceSEQuery') + PWC.limitString(crits.taxAmountStart, 5) + $translate.instant('MoreThan');
-                crit.fullName = $translate.instant('InvoiceSEQuery') + crits.taxAmountStart + $translate.instant('MoreThan');
-                crit.valueFrom = crits.taxAmountStart;
-                crit.valueTo = crits.taxAmountEnd;
-                crit.propertyName = "taxAmountStart|taxAmountEnd";
-
-                $scope.criteriaList.push(crit);
-            }
-            else if (PWC.isNullOrEmpty(crits.taxAmountStart) && !PWC.isNullOrEmpty(crits.taxAmountEnd)) {
-                crit = new Object;
-                crit.name = $translate.instant('InvoiceSEQuery') + PWC.limitString(crits.taxAmountEnd, 5) + $translate.instant('LessThan');
-                crit.fullName = $translate.instant('InvoiceSEQuery') + crits.taxAmountEnd + $translate.instant('LessThan');
-                crit.valueFrom = crits.taxAmountStart;
-                crit.valueTo = crits.taxAmountEnd;
-                crit.propertyName = "taxAmountStart|taxAmountEnd";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            //发票类型
-            if (!PWC.isNullOrEmpty(crits.invoiceType)) {
-                crit = new Object;
-                crit.valueFrom = _.find($scope.invoiceTypeList, function (v) {
-                    return v.id === crits.invoiceType;
-                }).name;
-
-                crit.name = $translate.instant('InvoiceFPLXQuery') + crit.valueFrom;
-                crit.fullName = $translate.instant('InvoiceFPLXQuery') + crit.valueFrom;
-                crit.propertyName = "invoiceType";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            //认证结果
-            if (!PWC.isNullOrEmpty(crits.certificationStatus)) {
-                crit = new Object;
-                crit.valueFrom = _.find($scope.cetificationResultList, function (v) {
-                    return v.id === crits.certificationStatus;
-                }).name;
-                crit.name = $translate.instant('InvoiceRZJGQuery') + crit.valueFrom;
-                crit.fullName = $translate.instant('InvoiceRZJGQuery') + crit.valueFrom;
-                crit.propertyName = "certificationStatus";
-
-                $scope.criteriaList.push(crit);
-            }
-
-            // add to Criteria List for display on top of the grid:
-            //********************************************************************************
-
-            var criteria = JSON.stringify($scope.queryParams);
-            if (browserService.isIE() || browserService.isEdge())
-                criteria = encodeURIComponent(criteria);
-            countTotal();
-            loadIncomeInvoiceItemDataFromDB(1);
-            if ($scope.criteriaList.length > 6) {
-                $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
-                $scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
-            }
-            else {
-                $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
-            }
+            loadTrialBalanceDataFromDB(1);
             $('.filter-button').popover("hide");
         };
 
@@ -442,24 +197,19 @@
             $scope.queryParams = {
                 pageInfo: {},
                 periodStart: '',
-                periodEnd: '',
-                certificationDateStart: null,
-                certificationDateEnd: null,
-                invoiceCode: '',
-                invoiceNumber: '',
-                sellerTaxNumber: '',
-                amountStart: null,
-                amountEnd: null,
-                invoiceType: null,
-                taxAmountStart: null,
-                taxAmountEnd: null,
-                certificationStatus: null
+                //periodEnd: '',
+                orgId:'',
+                segment3 : null,
+                segment3Name : null,
+                segment5 : null,
+                segment5Name : null,
+                segment6 : null,
+                segment6Name : null,
             };
-            $scope.criteriaList = [];
             $scope.queryParams.periodStart = $scope.startMonth;
-            $scope.queryParams.periodEnd = $scope.endMonth;
-            countTotal();
-            loadIncomeInvoiceItemDataFromDB(1);
+            //$scope.queryParams.periodEnd = $scope.endMonth;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+            loadTrialBalanceDataFromDB(1);
             $('.filter-button').popover("hide");
         };
 
@@ -470,201 +220,114 @@
         //在popover打开时执行事件
         var showPopover = function () {
             $timeout(function () {
-                initDatePickers();
+                initDatePicker();
             }, 500);
         };
 
-        //初始化时间控件
-        var initDatePickers = function () {
-            //认证开始时间
-            var ele1 = $("#certificationDateStart");
-            ele1.datepicker({
-                startDate: $scope.startDate,
-                endDate: $scope.endDate,
-                language: region,
-                autoclose: true,//选中之后自动隐藏日期选择框
-                clearBtn: true,//清除按钮
-                todayBtn: false,//今日按钮
-                format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+        //导出调整表
+        $scope.downloadAdjustmentTable = function () {
+            var localDate=$filter('date')(new  Date(), 'yyyyMMddHHmmss');
+            var fileName="调整表";
+            vatPreviewService.initExportATData($scope.queryParams,fileName).then(function (data) {
+                if (data) {
+                    ackMessageBox.success(translate('FileExportSuccess'));
+                }
             });
-            ele1.datepicker("setDate", $scope.queryParams.certificationDateStart);
-            //认证结束时间
-            var ele2 = $("#certificationDateEnd");
-            ele2.datepicker({
+        };
+
+         //初始化时间控件
+         var initDatePicker = function () {
+            var ele1 = $("#periodDatepicker");
+            ele1.datepicker({
                 startDate: $scope.startDate,
                 endDate: $scope.endDate,
                 language: region,
-                autoclose: true,//选中之后自动隐藏日期选择框
-                clearBtn: true,//清除按钮
-                todayBtn: false,//今日按钮
-                format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
-            })
-            ele2.datepicker("setDate", $scope.queryParams.certificationDateEnd);
-
-
-            //初始化已选择的发票类型和认证结果
-            $scope.InvoiceType.selected = _.find($scope.invoiceTypeList, function (v) {
-                return v.id == $scope.queryParams.invoiceType;
-            })
-
-            $scope.CertificationStatus.selected = _.find($scope.cetificationResultList, function (v) {
-                return v.id == $scope.queryParams.certificationStatus;
-            })
-        };
-
-        //发票类型转换
-        $scope.typeToString = function (strType) {
-            var type = invoiceTypeEnum.VATInvoice;
-            switch (strType) {
-                case 1:
-                    type = invoiceTypeEnum.VATInvoice;
-                    break;
-                case 2:
-                    type = invoiceTypeEnum.FreightTransport;
-                    break;
-                case 3:
-                    type = invoiceTypeEnum.MotorVehicle;
-                    break;
-                case 4:
-                    type = invoiceTypeEnum.AgriculturalProduct;
-                    break;
-                default:
-                    type = "";
-            }
-            return type;
-        };
-
-        //导出进项发票数据
-        var downloadInputInvoice = function () {
-            vatPreviewService.getExportInputInvoiceList($scope.queryParams).success(function (data, status, headers) {
-                if(status===204){
-                    SweetAlert.warning("没有数据可以下载");
-                    return;
-                }
-                vatExportService.exportToExcel(data, status, headers, '进项发票信息');
+                viewMode: $scope.viewMode,
+                minViewMode: $scope.viewMode,
+                autoclose: true, //选中之后自动隐藏日期选择框
+                clearBtn: false, //清除按钮
+                todayBtn: false, //今日按钮
+                format: $scope.dateFormatMomth //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+            }).on('changeDate', function (e) {
+                // 开始月份
+                var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;
+                $scope.queryParams.periodStart = startMonth;
+                loadTrialBalanceDataFromDB(1);
             });
+            ele1.datepicker("setDate", $scope.selectedDate);
         };
 
-
         (function initialize() {
             $log.debug('VatPreviewInputInvoiceController.ctor()...');
-            $('#input-invoice-period-picker').focus(function () {
-                $('.filter-button').popover("hide");
-            });
-            //初始化month-picker
-            $('#input-invoice-period-picker').rangePicker({
-                minDate: minDate,
-                maxDate: maxDate,
-                setDate: setDate,
-                months: $scope.monthList,//['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-                ConfirmBtnText: $translate.instant('Confirm'),
-                CancelBtnText: $translate.instant('ButtonCancel')
-            })
-             .on('datePicker.done', function (e, result) {
-                 //开始月份
-                 var startMonth = result[0][0];
-                 //结束月份
-                 var endMonth = result[1][0];
-                 $scope.startMonth = startMonth;
-                 $scope.endMonth = endMonth;
-
-                 $scope.queryParams.periodStart = startMonth;
-                 $scope.queryParams.periodEnd = endMonth;
-                 countTotal();
-                 loadIncomeInvoiceItemDataFromDB(1);
-             });
-
-
+            initPeriods();
+            initDatePicker();
             $scope.gridOptions = {
                 rowHeight: constant.UIGrid.rowHeight,
                 selectionRowHeaderWidth: constant.UIGrid.rowHeight,
-                expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
+                // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
                 virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
                 enableSorting: false,
                 enableColumnMenus: false,
+                enableHorizontalScrollbar : 1,
                 columnDefs: [
-                 { name: $translate.instant('VatInvoiceRecordNoCol'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
-                 // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('BillingBody'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.kprq | date:"yyyy-MM-dd"}}<span></div>' },
-                 { name: $translate.instant('CustomerCompanyName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.fpdm}}</span></div>' },
-                 { name: $translate.instant('RecordInvoiceType'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fphm}}</span></div>' },
-                 { name: $translate.instant('RecordBillingContent'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.xfsh}}</span></div>' },
-                 { name: $translate.instant('InvoiceAmount'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">增值税专票</span></div>' },
-                 { name: $translate.instant('Applicant'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjje}}</span></div>' },
-                 { name: $translate.instant('OAApplicationNum'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.hjse}}</span></div>' },
-                 { name: $translate.instant('ContractNo'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzsj  | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('ContractAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('Department'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('ApplicationDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('RecordBillingDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('BillingMonth'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('RecordInvoiceCode'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('RecordInvoiceNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('InvoiceNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('CustomerCompanyTaxNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('CustomerSourceSystem'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('RecordTaxRate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('TaxAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('InvoiceStatus'),cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('InvoiceSource'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' },
-                 { name: $translate.instant('InvoiceRemarks'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.rzjg}}</span></div>' }
-                 ],
-                onRegisterApi: function (gridApi) {
-                                   $scope.gridApi = gridApi;
-
-                                   //定义子table属性
-                                   gridApi.expandable.on.rowExpandedStateChanged($scope, function (row) {
-                                       if (row.isExpanded) {
-                                           row.entity.subGridOptions = {
-                                               rowHeight: constant.UIGrid.rowHeight,
-                                               selectionRowHeaderWidth: constant.UIGrid.rowHeight,
-                                               virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
-                                               enableSorting: false,
-                                               enableColumnMenus: false,
-                                               columnDefs: [
-                                               // { name: $translate.instant('ImportErrorPopUpNoCol'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
-                                               { name: $translate.instant('InvoiceHWMC'), headerCellClass:'right', width: '20%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right" title="{{row.entity.spmc}}">{{row.entity.spmc}}<span></div>' },
-                                               { name: $translate.instant('InvoiceJE'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
-                                               { name: $translate.instant('InvoiceSL'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.slv}}%<span></div>' },
-                                               { name: $translate.instant('InvoiceSE'), headerCellClass:'right', width: '13%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
-                                               ]
-                                           };
-
-                                           //获取子table数据
-                                           vatPreviewService.queryInputInvoiceItemList(row.entity.id).success(function (data) {
-                                               if (data) {
-                                                   var index = 1;
-                                                   data.forEach(function (v) {
-                                                       v.index = index++;
-                                                       v.je = PWC.round(v.je, 2);
-                                                       v.se = PWC.round(v.se, 2);
-                                                   });
-                                                   row.entity.subGridOptions.data = data;
-                                               }
-                                           });
-                                       }
-                                   });
-
-                    $interval(function () {
-                        $scope.gridApi.core.handleWindowResize();
-                    }, 500, 60 * 60 * 8);
-                }
+                 { name: $translate.instant('InvoiceQJ'), width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.period}}<span></div>' },
+                 { name: $translate.instant('MainBody'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1}}<span></div>' },
+                 { name: $translate.instant('CostCenter'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2}}</span></div>' },
+                 { name: $translate.instant('Subject'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3}}</span></div>' },
+                 { name: $translate.instant('AuxiliarySubject'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4}}</span></div>' },
+                 { name: $translate.instant('ProfitCenter'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.segment5}}">{{row.entity.segment1}}</span></div>' },
+                 { name: $translate.instant('Product'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.segment6}}</span></div>' },
+                 { name: $translate.instant('ProjectName'),  width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.segment7}}</span></div>' },
+                 { name: $translate.instant('BetweenCompanies'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8}}</span></div>' },
+                 { name: $translate.instant('Alternate1'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9}}</span></div>' },
+                 { name: $translate.instant('Alternate2'),width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10}}</span></div>' },
+                 { name: $translate.instant('MainBodyDescription'), width: 300,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1Name}}</span></div>' },
+                 { name: $translate.instant('CostCenterDescription'), width: 300,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' },
+                 { name: $translate.instant('SubjectDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3Name}}</span></div>' },
+                 { name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' },
+                 { name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
+                 { name: $translate.instant('ProductManual'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' },
+                 { name: $translate.instant('ProjectInstruction'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' },
+                 { name: $translate.instant('InterCompanyDescription'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' },
+                 { name: $translate.instant('Alternate1Description'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
+                 { name: $translate.instant('Alternate2Description'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
+                 {
+                     name: $translate.instant('CurrentPeriodDebitBal'),
+                     headerCellClass:'rightHeader',
+                     width: 100,
+                     cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodDrBeq | number:2}}</span></div>'
+                 },
+                 {
+                     name: $translate.instant('CurrentPeriodCreditBal'),
+                     headerCellClass:'rightHeader',
+                     width: 100,
+                     cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodCrBeq | number:2}}</span></div>'
+                 },
+                 {
+                     name: $translate.instant('EndingBalance'),
+                     headerCellClass:'rightHeader',
+                     width: 100,
+                     cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBalBeq | number:2}}</span></div>'
+                  }
+                ]
             };
 
             $scope.doDataFilter = doDataFilter;
             $scope.doDataFilterReset = doDataFilterReset;
             $scope.prepareSummary = prepareSummary;
             $scope.showPopover = showPopover;
-            $scope.downloadInputInvoice = downloadInputInvoice;
 
-            initPeriods();
-            initIncomeInvoiceItemPagination();
+            initTrialBalancePagination();
             //初始化查询条件-期间范围
-            $scope.queryParams.periodStart = vatSessionService.month;
-            $scope.queryParams.periodEnd = vatSessionService.month;
-            countTotal();
-            loadIncomeInvoiceItemDataFromDB(1);
-
+            $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
+           // $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+            if($rootScope.currentLanguage === 'en-us'){
+                $('.periodInput')[0].style.left = "230px";
+            }else{
+                $('.periodInput')[0].style.left = "150px";
+            }
+            loadTrialBalanceDataFromDB(1);
         })();
     }
 ]);

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.html

@@ -5,18 +5,17 @@
                 popover-container="body" popover-auto-hide="true" data-overwrite="true"
                 use-optimized-placement-algorithm="true"
                 data-placement="bottom"
-                data-templateurl="/app/vat/preview/vat-preview-vat-invoice-record/vat-preview-vat-invoice-record-search.html">
+                data-templateurl="/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab-search.html">
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="AdjustmentTableTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 230px;" id="input-invoice-period-picker" />
-        <span ng-click="downloadInputInvoice()" 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">
-        <span class="text-bold">&nbsp;&nbsp;&nbsp;合&nbsp;计&nbsp;：</span>&nbsp;
-        金额<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp;
-        税额<span class="numAmount">{{totalTaxAmount}}</span>
+        <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
+                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:150px;width: 120px;"/>
+        <div style="position: relative; top: -56px; left: 72%;width: 380px;">
+            {{'ImportTime' | translate}} : <span  style=" width: 150px;display: inline-block; ">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>&nbsp;&nbsp;
+            <!-- <span translate="ImportTime" style="position: relative; top: -61px; left: 75%;"></span><span style="position: relative; top: -61px; left: 75%;">: {{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span> -->
+            <span ng-click="downloadAdjustmentTable()" style="margin-left: 45px; "><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
+        </div>
     </div>
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
@@ -38,11 +37,11 @@
     </div>
 
     <div id="mainAreaDiv" class="main-area">
-        <div class="inputInvoiceGrid" ui-grid-expandable ui-grid="gridOptions">
+        <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}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.total}}条记录</span>
+            <span>本页{{curPageItemCount}}条记录，共{{queryTrialBalanceResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.less

@@ -123,7 +123,9 @@
     }
 }
 
-
+.rightHeader{
+    text-align: right;
+}
 
 .popover {
     min-width: 370px;

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual-search.html

+<div class="popover">
+    <div class="arrow"></div>
+    <div class="popover-content">
+        <div>
+            <table class="table table-responsive">
+                <tr>
+                    <td>
+                        <span translate="InvoiceRZRQQuery"></span>
+                        <input class="form-control input-width-small" id="certificationDateStart" ng-model="queryParams.certificationDateStart" />&nbsp;-&nbsp;
+                        <input class="form-control input-width-small" id="certificationDateEnd" ng-model="queryParams.certificationDateEnd" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceFPDMQuery"></span>
+                        <input class="form-control input-width-middle" type="text" id="invoiceCode" ng-model="queryParams.invoiceCode" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceFPHMQuery"></span>
+                        <input class="form-control input-width-middle" type="text" id="invoiceNumber" ng-model="queryParams.invoiceNumber" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceGHFSHQuery"></span>
+                        <input class="form-control input-width-middle" type="text" id="sellerTaxNumber" ng-model="queryParams.sellerTaxNumber" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceJEQuery"></span>
+                        <input class="form-control input-width-small" type="text" id="amountStart" ng-model="queryParams.amountStart" onkeyup="PWC.inputNumberFormat(this);" />&nbsp;-&nbsp;
+                        <input class="form-control input-width-small" type="text" id="amountEnd" ng-model="queryParams.amountEnd" onkeyup="PWC.inputNumberFormat(this);" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceSEQuery"></span>
+                        <input class="form-control input-width-small" type="text" id="taxAmountStart" ng-model="queryParams.taxAmountStart" onkeyup="PWC.inputNumberFormat(this);" />&nbsp;-&nbsp;
+                        <input class="form-control input-width-small" type="text" id="taxAmountEnd" ng-model="queryParams.taxAmountEnd" onkeyup="PWC.inputNumberFormat(this);" />
+                    </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/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js

+vatModule.controller('VatPreviewOffBalanceSheetPrcManualController', ['$rootScope','$scope', '$log','$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
+    function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
+        'use strict';
+
+        $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
+        $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
+        $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
+        $scope.startMonth = vatSessionService.month;
+        $scope.endMonth = vatSessionService.month;
+        $scope.totalMoneyAmount = 0;
+        $scope.totalTaxAmount = 0;
+        $scope.pageSize = constant.vatPagesize;
+
+        $scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
+        $scope.dateFormatMomth = $translate.instant('dateFormat4YearMonth');
+        $scope.viewMode = 1;
+
+        var minDate = [1, vatSessionService.project.year];
+        // var minDate = moment().startOf('month').subtract(0, 'months');
+        var maxDate = [12, vatSessionService.project.year];
+        var setDate = [
+            [vatSessionService.month, vatSessionService.project.year],
+            [vatSessionService.month, vatSessionService.project.year]];
+
+        //发票类型
+        var invoiceTypeEnum = {
+            VATInvoice: $translate.instant('VATInvoice'),
+            FreightTransport: $translate.instant('FreightTransport'),
+            MotorVehicle: $translate.instant('MotorVehicle'),
+            AgriculturalProduct: $translate.instant('AgriculturalProduct')
+        };
+
+        $scope.monthList = [$translate.instant('Month01'),
+                            $translate.instant('Month02'),
+                            $translate.instant('Month03'),
+                            $translate.instant('Month04'),
+                            $translate.instant('Month05'),
+                            $translate.instant('Month06'),
+                            $translate.instant('Month07'),
+                            $translate.instant('Month08'),
+                            $translate.instant('Month09'),
+                            $translate.instant('Month10'),
+                            $translate.instant('Month11'),
+                            $translate.instant('Month12')
+        ];
+
+        //认证结果
+        $scope.cetificationResultList = [
+            { id: 999, name: $translate.instant('AllTheItems') },
+            { id: 1, name: $translate.instant('CertificationPass') },
+            { id: 2, name: $translate.instant('CertificationNotPass') }
+        ];
+
+        //发票类型
+        $scope.invoiceTypeList = [
+            { id: 999, name: $translate.instant('AllTheItems') },
+            { id: enums.invoiceType.VATInvoice, name: $translate.instant('VATInvoice') },
+            { id: enums.invoiceType.FreightTransport, name: $translate.instant('FreightTransport') },
+            { id: enums.invoiceType.MotorVehicle, name: $translate.instant('MotorVehicle') },
+            { id: enums.invoiceType.AgriculturalProduct, name: $translate.instant('AgriculturalProduct') }
+        ];
+
+
+        $scope.InvoiceType = {};
+        $scope.CertificationStatus = {};
+
+        //初始化期间
+        var initPeriods = function () {
+            var curMonth = new Date().getMonth() + 1;
+            $scope.queryParams = {
+                pageInfo: {},
+                periodStart: '',
+                periodEnd: '',
+                orgId: ''
+            };
+        };
+
+        //从数据库中load数据
+        var loadBalanceSheetDataFromDB = function (pageIndex) {
+            initBalanceSheetPagination();
+            $scope.curBalanceSheetPage = pageIndex;
+
+            //初始化查询信息
+            $scope.queryParams.pageInfo = {
+                totalCount: $scope.queryBalanceSheetResult.pageInfo.totalCount,
+                pageIndex: pageIndex,
+                pageSize: $scope.queryBalanceSheetResult.pageInfo.pageSize,
+                totalPage: 0
+            };
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+
+            $scope.getDataFromDatabase($scope.queryParams);
+        };
+
+        $scope.getDataFromDatabase = function (queryParams){
+            vatPreviewService.getBSprcManualDataForDisplay(queryParams).success(function (data) {
+                if (data) {
+                    // minDate = data.
+                    var index = 1;
+                    data.list.forEach(function (v) {
+                        v.index = index++;
+                    });
+                    $scope.gridOptions.data = data.list;
+                    $scope.queryBalanceSheetResult.pageInfo = data;
+                    computeBalanceSheetPage();
+                    if(data.size>0){
+                        $scope.ledgerName = data.list[0].ledgerName;
+                        $scope.currencyCode = data.list[0].ledgerCurrencyCode;
+                        $scope.status = data.list[0].status;
+                        $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
+                    }
+                }
+            });
+        };
+
+
+        //点击任意一页加载数据事件
+        var loadIncomeInvoiceDataByPage = function (pageIndex) {
+            loadBalanceSheetDataFromDB(pageIndex);
+        };
+
+        //计算页数，创建分页栏
+        var computeBalanceSheetPage = function () {
+
+            if ($scope.queryBalanceSheetResult.pageInfo && $scope.queryBalanceSheetResult.pageInfo.total > 0) {
+
+                var totalPage = parseInt($scope.queryBalanceSheetResult.pageInfo.total / $scope.pageSize);
+                totalPage = $scope.queryBalanceSheetResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
+
+                //计算本页记录数
+                if ($scope.queryBalanceSheetResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryBalanceSheetResult.pageInfo.total % $scope.pageSize;
+                }
+                else {
+                    $scope.curPageItemCount = $scope.pageSize;
+                }
+
+                $scope.queryBalanceSheetResult.pageInfo.totalPage = totalPage;
+
+                var createPage = $("#totalInvoicePage").createPage({
+                    pageCount: totalPage,
+                    current: $scope.curBalanceSheetPage,
+                    backFn: function (p) {
+                        //单击回调方法，p是当前页码
+                        loadIncomeInvoiceDataByPage(p);
+                    }
+                });
+
+                $('#totalInvoicePage').css('display', 'inline-block');
+            } else {
+                //如果查询结果为0，则直接设置本页记录数为0
+                $scope.curPageItemCount = 0;
+                var createPage = $("#totalInvoicePage").createPage({
+                    pageCount: 0,
+                    current: $scope.curBalanceSheetPage,
+                    backFn: function (p) {
+                        //单击回调方法，p是当前页码
+                        loadIncomeInvoiceDataByPage(p);
+                    }
+                });
+
+                $('#totalInvoicePage').css('display', 'inline-block');
+            }
+        };
+
+        //初始化分页信息
+        var initBalanceSheetPagination = function () {
+            $scope.queryBalanceSheetResult = {
+                list: [],
+                pageInfo: {
+                    totalCount: -1,
+                    pageIndex: 1,
+                    pageSize: constant.pagesize,
+                    totalPage: 0,
+                }
+            }
+
+            $scope.curBalanceSheetPage = 1;
+        };
+
+
+        //去掉所有的查询条件，重新load数据
+        var doDataFilterReset = function () {
+            $scope.queryParams = {
+                pageInfo: {},
+                periodStart: '',
+               // periodEnd: '',
+                certificationDateStart: null,
+                //certificationDateEnd: null,
+                invoiceCode: '',
+                invoiceNumber: '',
+                sellerTaxNumber: '',
+                amountStart: null,
+                amountEnd: null,
+                invoiceType: null,
+                taxAmountStart: null,
+                taxAmountEnd: null,
+                certificationStatus: null
+            };
+            $scope.criteriaList = [];
+            $scope.queryParams.periodStart = $scope.startMonth;
+           // $scope.queryParams.periodEnd = $scope.endMonth;
+            loadBalanceSheetDataFromDB(1);
+            $('.filter-button').popover("hide");
+        };
+
+        var prepareSummary = function () {
+            // do something before show popover
+        };
+
+        //在popover打开时执行事件
+        var showPopover = function () {
+            $timeout(function () {
+                initDatePickers1();
+            }, 500);
+        };
+
+        //初始化时间控件
+        var initDatePicker1 = function () {
+            var ele1 = $("#periodDatepicker");
+            ele1.datepicker({
+                startDate: $scope.startDate,
+                endDate: $scope.endDate,
+                language: region,
+                viewMode: $scope.viewMode,
+                minViewMode: $scope.viewMode,
+                autoclose: true, //选中之后自动隐藏日期选择框
+                clearBtn: false, //清除按钮
+                todayBtn: false, //今日按钮
+                format: $scope.dateFormatMomth //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+            }).on('changeDate', function (e) {
+                // 开始月份
+                var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;
+                $scope.queryParams.periodStart = startMonth;
+                loadBalanceSheetDataFromDB(1);
+            });
+            ele1.datepicker("setDate", $scope.selectedDate);
+        };
+
+
+        //导出进项发票数据
+        var downloadBS = function () {
+            var fileName="资产负债表PRC人工导入";
+            vatPreviewService.initExportBSprcManualData($scope.queryParams,fileName).success(function (data, status, headers) {
+                if(status===204){
+                    SweetAlert.warning("没有数据可以下载");
+                    return;
+                }
+                vatExportService.exportToExcel(data, status, headers, '资产负债表信息');
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
+
+        (function initialize() {
+            $log.debug('VatPreviewInputInvoiceController.ctor()...');
+            initPeriods();
+            initDatePicker1();
+            $scope.gridOptions = {
+                rowHeight: constant.UIGrid.rowHeight,
+                selectionRowHeaderWidth: constant.UIGrid.rowHeight,
+                // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
+                virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
+                enableSorting: false,
+                enableColumnMenus: false,
+                enableHorizontalScrollbar : 1,
+                columnDefs: [
+                    {
+                        name: $translate.instant('ProjectName'),
+                        cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
+                    },
+                    {
+                        name: $translate.instant('EndingBalance'),
+                        headerCellClass:'rightHeader',
+                        cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBal | number:2}}<span></div>'
+                    },
+                    {
+                        name: $translate.instant('InitialBalance'),
+                        headerCellClass:'rightHeader',
+                        cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.begBal | number:2}}</span></div>'
+                    }
+                ]
+            };
+
+            $scope.doDataFilterReset = doDataFilterReset;
+            $scope.prepareSummary = prepareSummary;
+            $scope.showPopover = showPopover;
+            $scope.downloadBS = downloadBS;
+
+            initBalanceSheetPagination();
+            //初始化查询条件-期间范围
+            $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+            if($rootScope.currentLanguage === 'en-us'){
+                $('.periodInput')[0].style.left = "265px";
+            }else{
+                $('.periodInput')[0].style.left = "230px";
+            }
+            loadBalanceSheetDataFromDB(1);
+
+        })();
+    }
+]);
+
+
+
+

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html

+<div class="vat-preview-off-balance-sheet-prc-manual" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 30px">
+        <!--<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/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet-search.html">
+            <i class="fa fa-filter" aria-hidden="true"></i>
+        </button>-->
+        <span translate="offBalanceSheetPRCManual" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
+                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:230px;width: 120px;"/>
+        <span ng-click="downloadBS()" 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}}条记录，共{{queryBalanceSheetResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.js

+vatModule.directive('vatPreviewOffBalanceSheetPrcManual', ['$log', 'browserService', '$translate', 'region', '$timeout',
+    function ($log, browserService, $translate, region, $timeout) {
+        $log.debug('vatPreviewOffBalanceSheetPrcManual.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'VatPreviewOffBalanceSheetPrcManualController',
+            link: function ($scope, element) {
+
+            }
+        }
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.less

+@import "~/app-resources/less/theme.less";
+
+.vat-preview-off-balance-sheet-prc-manual {
+    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: 45px;
+        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;
+    }
+}
+
+.rightHeader{
+    text-align: right;
+}
+
+.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/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual-search.html

+<div class="popover">
+    <div class="arrow"></div>
+    <div class="popover-content">
+        <div>
+            <table class="table table-responsive">
+                <tr>
+                    <td>
+                        <span translate="BillingContent"></span>
+                        <input class="form-control input-width-small" id="certificationDateStart" ng-model="queryParams.certificationDateStart" />&nbsp;-&nbsp;
+                        <input class="form-control input-width-small" id="certificationDateEnd" ng-model="queryParams.certificationDateEnd" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ApplicationSector"></span>
+                        <input class="form-control input-width-middle" type="text" id="invoiceCode" ng-model="queryParams.invoiceCode" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="ApplicationSector"></span>
+                        <input class="form-control input-width-middle" type="text" id="invoiceNumber" ng-model="queryParams.invoiceNumber" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceCode"></span>
+                        <input class="form-control input-width-middle" type="text" id="sellerTaxNumber" ng-model="queryParams.sellerTaxNumber" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span translate="InvoiceNumber"></span>
+                        <input class="form-control input-width-small" type="text" id="amountStart" ng-model="queryParams.amountStart" onkeyup="PWC.inputNumberFormat(this);" />&nbsp;-&nbsp;
+                        <input class="form-control input-width-small" type="text" id="amountEnd" ng-model="queryParams.amountEnd" onkeyup="PWC.inputNumberFormat(this);" />
+                    </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/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

+vatModule.controller('VatPreviewProfitLossPrcManualController', ['$rootScope','$scope', '$log','$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
+    function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
+        'use strict';
+
+        $scope.startDate = new Date(vatSessionService.project.year, 0, 1);
+        $scope.endDate = new Date(vatSessionService.project.year, 11, 31);
+        $scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
+        $scope.startMonth = vatSessionService.month;
+        $scope.endMonth = vatSessionService.month;
+        $scope.totalMoneyAmount = 0;
+        $scope.totalTaxAmount = 0;
+        $scope.pageSize = constant.vatPagesize;
+
+        $scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
+        $scope.dateFormatMomth = $translate.instant('dateFormat4YearMonth');
+        $scope.viewMode = 1;
+
+        var minDate = [1, vatSessionService.project.year];
+        // var minDate = moment().startOf('month').subtract(0, 'months');
+        var maxDate = [12, vatSessionService.project.year];
+        var setDate = [
+            [vatSessionService.month, vatSessionService.project.year],
+            [vatSessionService.month, vatSessionService.project.year]];
+
+        //发票类型
+        var invoiceTypeEnum = {
+            VATInvoice: $translate.instant('VATInvoice'),
+            FreightTransport: $translate.instant('FreightTransport'),
+            MotorVehicle: $translate.instant('MotorVehicle'),
+            AgriculturalProduct: $translate.instant('AgriculturalProduct')
+        };
+
+        $scope.monthList = [$translate.instant('Month01'),
+                            $translate.instant('Month02'),
+                            $translate.instant('Month03'),
+                            $translate.instant('Month04'),
+                            $translate.instant('Month05'),
+                            $translate.instant('Month06'),
+                            $translate.instant('Month07'),
+                            $translate.instant('Month08'),
+                            $translate.instant('Month09'),
+                            $translate.instant('Month10'),
+                            $translate.instant('Month11'),
+                            $translate.instant('Month12')
+        ];
+
+        //认证结果
+        $scope.cetificationResultList = [
+            { id: 999, name: $translate.instant('AllTheItems') },
+            { id: 1, name: $translate.instant('CertificationPass') },
+            { id: 2, name: $translate.instant('CertificationNotPass') }
+        ];
+
+        //发票类型
+        $scope.invoiceTypeList = [
+            { id: 999, name: $translate.instant('AllTheItems') },
+            { id: enums.invoiceType.VATInvoice, name: $translate.instant('VATInvoice') },
+            { id: enums.invoiceType.FreightTransport, name: $translate.instant('FreightTransport') },
+            { id: enums.invoiceType.MotorVehicle, name: $translate.instant('MotorVehicle') },
+            { id: enums.invoiceType.AgriculturalProduct, name: $translate.instant('AgriculturalProduct') }
+        ];
+
+
+        $scope.InvoiceType = {};
+        $scope.CertificationStatus = {};
+
+        //初始化期间
+        var initPeriods = function () {
+            var curMonth = new Date().getMonth() + 1;
+            $scope.queryParams = {
+                pageInfo: {},
+                periodStart: '',
+                periodEnd: ''
+            };
+        };
+
+        //从数据库中load数据
+        var loadProfitLossDataFromDB = function (pageIndex) {
+            initProfitLossPagination();
+            $scope.curProfitLossPage = pageIndex;
+
+            //初始化查询信息
+            $scope.queryParams.pageInfo = {
+                totalCount: $scope.queryProfitLossResult.pageInfo.totalCount,
+                pageIndex: pageIndex,
+                pageSize: $scope.queryProfitLossResult.pageInfo.pageSize,
+                totalPage: 0
+            };
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+
+            $scope.getDataFromDatabase($scope.queryParams);
+        };
+
+        $scope.getDataFromDatabase = function (queryParams){
+            vatPreviewService.getPLprcManualDataForDisplay(queryParams).success(function (data) {
+                if (data) {
+                    // minDate = data.
+                    var index = 1;
+                    data.list.forEach(function (v) {
+                        v.index = index++;
+                    });
+                    $scope.gridOptions.data = data.list;
+                    $scope.queryProfitLossResult.pageInfo = data;
+                    computeProfitLossPage();
+                    $scope.ledgerName = data.list[0].ledgerName;
+                    $scope.currencyCode = data.list[0].ledgerCurrencyCode;
+                    $scope.status = data.list[0].status;
+                    $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
+                }
+            });
+        };
+
+        //点击任意一页加载数据事件
+        var loadIncomeInvoiceDataByPage = function (pageIndex) {
+            loadProfitLossDataFromDB(pageIndex);
+        };
+
+        //计算页数，创建分页栏
+        var computeProfitLossPage = function () {
+
+            if ($scope.queryProfitLossResult.pageInfo && $scope.queryProfitLossResult.pageInfo.total > 0) {
+
+                var totalPage = parseInt($scope.queryProfitLossResult.pageInfo.total / $scope.pageSize);
+                totalPage = $scope.queryProfitLossResult.pageInfo.totalCount % $scope.pageSize == 0 ? totalPage : totalPage + 1;
+
+                //计算本页记录数
+                if ($scope.queryProfitLossResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryProfitLossResult.pageInfo.total % $scope.pageSize;
+                }
+                else {
+                    $scope.curPageItemCount = $scope.pageSize;
+                }
+
+                $scope.queryProfitLossResult.pageInfo.totalPage = totalPage;
+
+                var createPage = $("#totalInvoicePage").createPage({
+                    pageCount: totalPage,
+                    current: $scope.curProfitLossPage,
+                    backFn: function (p) {
+                        //单击回调方法，p是当前页码
+                        loadIncomeInvoiceDataByPage(p);
+                    }
+                });
+
+                $('#totalInvoicePage').css('display', 'inline-block');
+            } else {
+                //如果查询结果为0，则直接设置本页记录数为0
+                $scope.curPageItemCount = 0;
+                var createPage = $("#totalInvoicePage").createPage({
+                    pageCount: 0,
+                    current: $scope.curProfitLossPage,
+                    backFn: function (p) {
+                        //单击回调方法，p是当前页码
+                        loadIncomeInvoiceDataByPage(p);
+                    }
+                });
+
+                $('#totalInvoicePage').css('display', 'inline-block');
+            }
+        };
+
+        //初始化分页信息
+        var initProfitLossPagination = function () {
+            $scope.queryProfitLossResult = {
+                list: [],
+                pageInfo: {
+                    totalCount: -1,
+                    pageIndex: 1,
+                    pageSize: constant.pagesize,
+                    totalPage: 0,
+                }
+            }
+
+            $scope.curProfitLossPage = 1;
+        };
+
+        //去掉所有的查询条件，重新load数据
+        var doDataFilterReset = function () {
+            $scope.queryParams = {
+                pageInfo: {},
+                periodStart: '',
+                periodEnd: '',
+                certificationDateStart: null,
+                certificationDateEnd: null,
+                invoiceCode: '',
+                invoiceNumber: '',
+                sellerTaxNumber: '',
+                amountStart: null,
+                amountEnd: null,
+                invoiceType: null,
+                taxAmountStart: null,
+                taxAmountEnd: null,
+                certificationStatus: null
+            };
+            $scope.criteriaList = [];
+            $scope.queryParams.periodStart = $scope.startMonth;
+            $scope.queryParams.periodEnd = $scope.endMonth;
+            loadProfitLossDataFromDB(1);
+            $('.filter-button').popover("hide");
+        };
+
+        var prepareSummary = function () {
+            // do something before show popover
+        };
+
+        //在popover打开时执行事件
+        var showPopover = function () {
+            $timeout(function () {
+                initDatePicker();
+            }, 500);
+        };
+        //发票类型转换
+        $scope.typeToString = function (strType) {
+            var type = invoiceTypeEnum.VATInvoice;
+            switch (strType) {
+                case 1:
+                    type = invoiceTypeEnum.VATInvoice;
+                    break;
+                case 2:
+                    type = invoiceTypeEnum.FreightTransport;
+                    break;
+                case 3:
+                    type = invoiceTypeEnum.MotorVehicle;
+                    break;
+                case 4:
+                    type = invoiceTypeEnum.AgriculturalProduct;
+                    break;
+                default:
+                    type = "";
+            }
+            return type;
+        };
+
+        //导出进项发票数据
+        var downloadPL = function () {
+            var fileName="利润表PRC人工导入";
+            vatPreviewService.initExportPLprcManualData($scope.queryParams,fileName).success(function (data, status, headers) {
+                if(status===204){
+                    SweetAlert.warning("没有数据可以下载");
+                    return;
+                }
+                vatExportService.exportToExcel(data, status, headers, '利润表PRC人工导入信息');
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+        //初始化时间控件
+        var initDatePicker = function () {
+            var ele1 = $("#periodDatepicker");
+            ele1.datepicker({
+                startDate: $scope.startDate,
+                endDate: $scope.endDate,
+                language: region,
+                viewMode: $scope.viewMode,
+                minViewMode: $scope.viewMode,
+                autoclose: true, //选中之后自动隐藏日期选择框
+                clearBtn: false, //清除按钮
+                todayBtn: false, //今日按钮
+                format: $scope.dateFormatMomth //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+            }).on('changeDate', function (e) {
+                // 开始月份
+                var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;
+                $scope.queryParams.periodStart = startMonth;
+                loadProfitLossDataFromDB(1);
+            });
+            ele1.datepicker("setDate", $scope.selectedDate);
+        };
+
+        (function initialize() {
+            $log.debug('VatPreviewInputInvoiceController.ctor()...');
+            initPeriods();
+            initDatePicker();
+            $scope.gridOptions = {
+                rowHeight: constant.UIGrid.rowHeight,
+                selectionRowHeaderWidth: constant.UIGrid.rowHeight,
+                // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
+                virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
+                enableSorting: false,
+                enableColumnMenus: false,
+                columnDefs: [
+                 {
+                     name: $translate.instant('ProjectName'),
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
+                 },
+                 {
+                     name: $translate.instant('CurrentPeriodAmount'),
+                     headerCellClass:'rightHeader',
+                     cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodAmt | number:2}}<span></div>'
+                 },
+                 {
+                     name: $translate.instant('ThisYearAccumulatedAmount'),
+                     headerCellClass:'rightHeader',
+                     cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.ytdAmt | number:2}}</span></div>'
+                 }
+                ]
+            };
+
+            $scope.doDataFilterReset = doDataFilterReset;
+            $scope.prepareSummary = prepareSummary;
+            $scope.showPopover = showPopover;
+            $scope.downloadPL = downloadPL;
+            
+            initProfitLossPagination();
+            //初始化查询条件-期间范围
+            $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.orgId = vatSessionService.project.organizationID;
+            if($rootScope.currentLanguage === 'en-us'){
+                $('.periodInput')[0].style.left = "280px";
+            }else{
+                $('.periodInput')[0].style.left = "200px";
+            }
+            loadProfitLossDataFromDB(1);
+
+        })();
+    }
+]);
+
+
+
+

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

+<div class="vat-preview-profit-loss-prc-manual" id="mainPreviewDiv">
+    <div class="top-area-wrapper" style="margin-top: 30px">
+        <!--<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/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss-search.html">
+            <i class="fa fa-filter" aria-hidden="true"></i>
+        </button>-->
+        <span translate="profitLossPRCManual" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
+        <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
+                                   readonly="readonly" ng-model="UploadPeriodTime" style="position:relative;top:-30px;left:200px;width: 120px;"/>
+        <span ng-click="downloadPL()" 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}}条记录，共{{queryProfitLossResult.pageInfo.total}}条记录</span>
+            <div id="totalInvoicePage" class="common-pagination" style="display:none;">
+            </div>
+        </div>
+    </div>
+
+</div>

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

+vatModule.directive('vatPreviewProfitLossPrcManual', ['$log', 'browserService', '$translate', 'region', '$timeout',
+    function ($log, browserService, $translate, region, $timeout) {
+        $log.debug('vatPreviewProfitLossPrcManual.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'VatPreviewProfitLossPrcManualController',
+            link: function ($scope, element) {
+
+            }
+        }
+    }
+]);
\ No newline at end of file

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

+@import "~/app-resources/less/theme.less";
+
+.vat-preview-profit-loss-prc-manual {
+    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: 45px;
+        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;
+    }
+}
+
+.rightHeader{
+    text-align: right;
+}
+
+.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;
+    }
+}