Skip to content

T
traffic-front
Commit 74ff8e0d authored by Eddie.Wu's avatar Eddie.Wu
Browse files
Options

Merge branch 'dev_mysql_ken' into 'dev_mysql' 

Vat 报表预览

See merge request root/atms!383
parents 519d1ed2 5dd5d411
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 811 additions and 107 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/ExportTemplatePathConstant.java
View file @ 74ff8e0d
...@@ -13,4 +13,9 @@ public final class ExportTemplatePathConstant { ...@@ -13,4 +13,9 @@ public final class ExportTemplatePathConstant {
public static final String RED_LETTER_INFO_TAB = "/vat_excel_template/red_letter_info_tab.xlsx"; 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 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 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";
public static final String CASH_FLOW_MANUAL = "/vat_excel_template/cash_flow_manual.xlsx";
} }
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/AdjustmentTableParam.java 0 → 100644
View file @ 74ff8e0d
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/excelheader/CashFlowHeader.java
View file @ 74ff8e0d
...@@ -3,6 +3,7 @@ package pwc.taxtech.atms.dto.vatdto.excelheader; ...@@ -3,6 +3,7 @@ package pwc.taxtech.atms.dto.vatdto.excelheader;
public class CashFlowHeader { public class CashFlowHeader {
private String companyNameCn; private String companyNameCn;
private String companyNameEn; private String companyNameEn;
private String companyCode;
private Integer periodStart; private Integer periodStart;
private Integer periodEnd; private Integer periodEnd;
private String ledgerName; private String ledgerName;
...@@ -25,6 +26,16 @@ public class CashFlowHeader { ...@@ -25,6 +26,16 @@ public class CashFlowHeader {
this.companyNameEn = companyNameEn; this.companyNameEn = companyNameEn;
} }
public String getCompanyCode() {
return companyCode;
}
public void setCompanyCode(String companyCode) {
this.companyCode = companyCode;
}
public Integer getPeriodStart() { public Integer getPeriodStart() {
return periodStart; return periodStart;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/excelheader/ProfitLossHeader.java 0 → 100644
View file @ 74ff8e0d
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/CommonDocumentHelper.java
View file @ 74ff8e0d
...@@ -25,7 +25,7 @@ public class CommonDocumentHelper { ...@@ -25,7 +25,7 @@ public class CommonDocumentHelper {
public void toXlsxFileUsingJxls(List<?> list, String excelTemplatePathInClassPath, String outputFilePath) { public void toXlsxFileUsingJxls(List<?> list, String excelTemplatePathInClassPath, String outputFilePath) {
//InputStream is = Streams.fileIn(excelTemplatePathInClassPath); //InputStream is = Streams.fileIn(excelTemplatePathInClassPath);
InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath); InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath);
OutputStream os = Streams.fileOut(outputFilePath); OutputStream os = Streams.fileOut(outputFilePath);
Context context = new Context(); Context context = new Context();
context.putVar("list", list); context.putVar("list", list);
...@@ -50,9 +50,10 @@ public class CommonDocumentHelper { ...@@ -50,9 +50,10 @@ public class CommonDocumentHelper {
Streams.safeClose(os); Streams.safeClose(os);
} }
} }
public OutputStream toXlsxFileUsingJxls(Object header, List<?> list, String excelTemplatePathInClassPath) { public OutputStream toXlsxFileUsingJxls(Object header, List<?> list, String excelTemplatePathInClassPath) {
//InputStream is = Streams.fileIn(excelTemplatePathInClassPath); //InputStream is = Streams.fileIn(excelTemplatePathInClassPath);
InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath); InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath);
OutputStream os = new ByteArrayOutputStream(); OutputStream os = new ByteArrayOutputStream();
Context context = new Context(); Context context = new Context();
context.putVar("header", header); context.putVar("header", header);
...@@ -81,7 +82,7 @@ public class CommonDocumentHelper { ...@@ -81,7 +82,7 @@ public class CommonDocumentHelper {
public OutputStream toXlsxFileUsingJxls(List<?> list, String excelTemplatePathInClassPath) { public OutputStream toXlsxFileUsingJxls(List<?> list, String excelTemplatePathInClassPath) {
//InputStream is = Streams.fileIn(excelTemplatePathInClassPath); //InputStream is = Streams.fileIn(excelTemplatePathInClassPath);
InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath); InputStream is = this.getClass().getResourceAsStream(excelTemplatePathInClassPath);
OutputStream os = new ByteArrayOutputStream(); OutputStream os = new ByteArrayOutputStream();
Context context = new Context(); Context context = new Context();
context.putVar("list", list); context.putVar("list", list);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
View file @ 74ff8e0d
package pwc.taxtech.atms.vat.service.impl; package pwc.taxtech.atms.vat.service.impl;
import java.util.Date;
import org.activiti.engine.HistoryService; import org.activiti.engine.HistoryService;
import org.activiti.engine.RepositoryService; import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
...@@ -222,7 +220,7 @@ public class ApprovalService { ...@@ -222,7 +220,7 @@ public class ApprovalService {
pa.setId(approve.getId()); pa.setId(approve.getId());
switch (decide) { switch (decide) {
case Constant.APPROVAL_AGREED: case Constant.APPROVAL_AGREED:
pa.setStatus(Constant.APPROVAL_AGREED); pa.setStatus(Constant.APPROVAL_COMMITTED);
map.put("decide", 1); map.put("decide", 1);
break; break;
case Constant.APPROVAL_DISAGREED: case Constant.APPROVAL_DISAGREED:
...@@ -261,13 +259,13 @@ public class ApprovalService { ...@@ -261,13 +259,13 @@ public class ApprovalService {
tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_TAX_BP).processInstanceId( tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_TAX_BP).processInstanceId(
instanceId).list(); instanceId).list();
if (tasks1 != null && tasks1.size() == 1) { if (tasks1 != null && tasks1.size() == 1) {
repositoryService.deleteDeployment(tasks1.get(0).getId()); runtimeService.deleteProcessInstance(tasks1.get(0).getProcessInstanceId(),comment);
} }
}else{ }else{
tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_COMPLIANCE_IA).processInstanceId( tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_COMPLIANCE_IA).processInstanceId(
instanceId).list(); instanceId).list();
if (tasks1 != null && tasks1.size() == 1) { if (tasks1 != null && tasks1.size() == 1) {
repositoryService.deleteDeployment(tasks1.get(0).getId()); runtimeService.deleteProcessInstance(tasks1.get(0).getProcessInstanceId(),comment);
} }
} }
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/AdjustmentTableMapper.java
View file @ 74ff8e0d
package pwc.taxtech.atms.vat.dao; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper; 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.AdjustmentTable;
import pwc.taxtech.atms.vat.entity.AdjustmentTableExample; import pwc.taxtech.atms.vat.entity.AdjustmentTableExample;
import java.util.List;
import java.util.Map;
@Mapper @Mapper
public interface AdjustmentTableMapper extends MyVatMapper { public interface AdjustmentTableMapper extends MyVatMapper {
/** /**
...@@ -112,4 +113,6 @@ public interface AdjustmentTableMapper extends MyVatMapper { ...@@ -112,4 +113,6 @@ public interface AdjustmentTableMapper extends MyVatMapper {
List<AdjustmentTable> selectBeforeAdjustData(Map<String,Object> map1); 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
View file @ 74ff8e0d
package pwc.taxtech.atms.vat.dao; package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
...@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.BalanceSheet; ...@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.BalanceSheet;
import pwc.taxtech.atms.vat.entity.BalanceSheetPrc; import pwc.taxtech.atms.vat.entity.BalanceSheetPrc;
import pwc.taxtech.atms.vat.entity.BalanceSheetPrcExample; import pwc.taxtech.atms.vat.entity.BalanceSheetPrcExample;
import java.util.List;
@Mapper @Mapper
public interface BalanceSheetPrcManualMapper extends MyVatMapper { public interface BalanceSheetPrcManualMapper extends MyVatMapper {
/** /**
...@@ -110,5 +111,7 @@ public interface BalanceSheetPrcManualMapper extends MyVatMapper { ...@@ -110,5 +111,7 @@ public interface BalanceSheetPrcManualMapper extends MyVatMapper {
List<BalanceSheet> selectByCondition(@Param("bsCondition") BalanceSheetCondition condition); List<BalanceSheet> selectByCondition(@Param("bsCondition") BalanceSheetCondition condition);
List<BalanceSheetPrc> selectByCondition1(@Param("bsCondition") BalanceSheetCondition condition);
int insertBatch(List<BalanceSheet> bls); int insertBatch(List<BalanceSheet> bls);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/ProfitLossStatementPrcManualMapper.java
View file @ 74ff8e0d
package pwc.taxtech.atms.vat.dao; package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
...@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.ProfitLossStatement; ...@@ -10,6 +9,8 @@ import pwc.taxtech.atms.vat.entity.ProfitLossStatement;
import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrc; import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrc;
import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrcExample; import pwc.taxtech.atms.vat.entity.ProfitLossStatementPrcExample;
import java.util.List;
@Mapper @Mapper
public interface ProfitLossStatementPrcManualMapper extends MyVatMapper { public interface ProfitLossStatementPrcManualMapper extends MyVatMapper {
/** /**
...@@ -110,5 +111,8 @@ public interface ProfitLossStatementPrcManualMapper extends MyVatMapper { ...@@ -110,5 +111,8 @@ public interface ProfitLossStatementPrcManualMapper extends MyVatMapper {
List<ProfitLossStatement> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition); List<ProfitLossStatement> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition);
//无时间区间条件查询
List<ProfitLossStatementPrc> selectByCondition1(@Param("plCondition") ProfitLossStatementCondition condition);
int insertBatch(List<ProfitLossStatement> pls); int insertBatch(List<ProfitLossStatement> pls);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/AdjustmentTableCondition.java 0 → 100644
View file @ 74ff8e0d
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
View file @ 74ff8e0d
...@@ -714,4 +714,13 @@ WHERE ...@@ -714,4 +714,13 @@ WHERE
</select> </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> </mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/AdjustmentTableExtendsMapper.xml
View file @ 74ff8e0d
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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 id="insertBatch" parameterType="java.util.List">
insert into adjustment_table insert into adjustment_table
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetPrcManualExtendsMapper.xml
View file @ 74ff8e0d
...@@ -24,6 +24,25 @@ ...@@ -24,6 +24,25 @@
<include refid="QueryCondition"/> <include refid="QueryCondition"/>
</select> </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 id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_prc_manual insert into balance_sheet_prc_manual
(<include refid="Base_Column_List"/>) (<include refid="Base_Column_List"/>)
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowManualExtendsMapper.xml
View file @ 74ff8e0d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<sql id="QueryCondition"> <sql id="QueryCondition">
1 = 1 1 = 1
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)"> <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{cfCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="cfCondition.periodStart!=null"> <if test="cfCondition.periodStart!=null">
AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementPrcManualExtendsMapper.xml
View file @ 74ff8e0d
...@@ -24,6 +24,25 @@ ...@@ -24,6 +24,25 @@
<include refid="QueryCondition"/> <include refid="QueryCondition"/>
</select> </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 id="insertBatch" parameterType="java.util.List">
insert into profit_loss_statement_prc_manual insert into profit_loss_statement_prc_manual
(<include refid="Base_Column_List"/>) (<include refid="Base_Column_List"/>)
......
atms-web/src/main/webapp/Scripts/module-part1.js
View file @ 74ff8e0d
...@@ -612,22 +612,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -612,22 +612,22 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
sticky: true sticky: true
}); });
$stateProvider.state({ // $stateProvider.state({
name: 'vat.previewData.balanceSheet', // name: 'vat.previewData.balanceSheet',
url: '/balanceSheet', // url: '/balanceSheet',
views: { // views: {
'@vat.previewData': { // '@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation', // controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) { // function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]); // appTranslation.load([appTranslation.vat]);
}], // }],
template: '<vat-preview-balance-sheet></vat-preview-balance-sheet>', // template: '<vat-preview-balance-sheet></vat-preview-balance-sheet>',
} // }
}, // },
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat), // resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true, // deepStateRedirect: true,
sticky: true // sticky: true
}); // });
$stateProvider.state({ $stateProvider.state({
name: 'vat.previewData.accountVoucher', name: 'vat.previewData.accountVoucher',
...@@ -767,6 +767,40 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -767,6 +767,40 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'vat.previewData.vatPreviewProfitTable',
url: '/vatPreviewProfitTable',
views: {
'@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]);
}],
template: '<vat-preview-profit-table></vat-preview-profit-table>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({
name: 'vat.previewData.vatPreviewTheBalanceSheet',
url: '/vatPreviewTheBalanceSheet',
views: {
'@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]);
}],
template: '<vat-preview-the-balance-sheet></vat-preview-the-balance-sheet>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({ $stateProvider.state({
name: 'vat.previewData.coupaPurchasingReport', name: 'vat.previewData.coupaPurchasingReport',
url: '/coupaPurchasingReport', url: '/coupaPurchasingReport',
...@@ -818,6 +852,23 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -818,6 +852,23 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
sticky: true 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({ $stateProvider.state({
name: 'vat.previewData.profitLoss', name: 'vat.previewData.profitLoss',
url: '/profitLoss', url: '/profitLoss',
...@@ -901,6 +952,38 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g ...@@ -901,6 +952,38 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
deepStateRedirect: true, deepStateRedirect: true,
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'vat.previewData.cashFlowManual',
url: '/cashFlowManual',
views: {
'@vat.previewData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.vat]);
}],
template: '<vat-preview-cash-flow-manual></vat-preview-cash-flow-manual>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.vat),
deepStateRedirect: true,
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({ $stateProvider.state({
name: 'vat.previewData.offBalanceSheet', name: 'vat.previewData.offBalanceSheet',
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 74ff8e0d
...@@ -1510,8 +1510,11 @@ ...@@ -1510,8 +1510,11 @@
"Alternate1Description": "Alternate 1 Description", "Alternate1Description": "Alternate 1 Description",
"Alternate2Description": "Alternate 2 Description", "Alternate2Description": "Alternate 2 Description",
"YYYY-MM": "YYYY-MM", "YYYY-MM": "YYYY-MM",
"CurrentPeriodDebitBal":"Current Period DebitBal",
"CurrentPeriodCreditBal":"Current Period CreditBal",
"profitLoss": "Profit Statement", "profitLoss": "Profit Statement",
"profitLossPRC": "Profit Statement PRC", "profitLossPRC": "Profit Statement PRC",
"profitLossPRCManual": "Profit Statement PRC Manual",
"ProfitLossTitle": "Profit Statement", "ProfitLossTitle": "Profit Statement",
"CurrentPeriodAmount": "Current Period Amount", "CurrentPeriodAmount": "Current Period Amount",
"ThisYearAccumulatedAmount": "This Year Accumulated Amount", "ThisYearAccumulatedAmount": "This Year Accumulated Amount",
...@@ -1519,6 +1522,7 @@ ...@@ -1519,6 +1522,7 @@
"directMethodCashFlowStatement": "Direct Method Cash Flow Statement", "directMethodCashFlowStatement": "Direct Method Cash Flow Statement",
"offBalanceSheet": "Balance Sheet", "offBalanceSheet": "Balance Sheet",
"offBalanceSheetPRC": "Balance Sheet PRC", "offBalanceSheetPRC": "Balance Sheet PRC",
"offBalanceSheetPRCManual": "Balance Sheet PRC Manual",
"OffBalanceSheetTitle": "Balance sheet", "OffBalanceSheetTitle": "Balance sheet",
"InitialBalance": "Beginning Balance", "InitialBalance": "Beginning Balance",
"journal": "Journal Entry", "journal": "Journal Entry",
...@@ -1826,6 +1830,7 @@ ...@@ -1826,6 +1830,7 @@
"ImportType": "Import Type", "ImportType": "Import Type",
"cashFlow": "Cash Flow", "cashFlow": "Cash Flow",
"CashFlowDDTitle": "Cash Flow", "CashFlowDDTitle": "Cash Flow",
"CashFlowManual": "Cash Flow Manual",
"invoiceData": "Invoice Data", "invoiceData": "Invoice Data",
"InvoiceDataTitle": "Invoice Data", "InvoiceDataTitle": "Invoice Data",
"IDTotalAmount": "Total", "IDTotalAmount": "Total",
...@@ -1990,5 +1995,7 @@ ...@@ -1990,5 +1995,7 @@
"InputAllMandatoryInfo": "Please Input All The Mandatory Information", "InputAllMandatoryInfo": "Please Input All The Mandatory Information",
"NameShouldUniqueWarn": "Name Should Be Unique", "NameShouldUniqueWarn": "Name Should Be Unique",
"ProfitTable": "Profit Table",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 74ff8e0d
...@@ -1853,6 +1853,7 @@ ...@@ -1853,6 +1853,7 @@
"TrialBalanceDDTitle": "科目余额表", "TrialBalanceDDTitle": "科目余额表",
"cashFlow":"现金流量表", "cashFlow":"现金流量表",
"CashFlowDDTitle":"现金流量表", "CashFlowDDTitle":"现金流量表",
"CashFlowManual": "现金流量表人工导入",
"TBAccountCode": "科目编号", "TBAccountCode": "科目编号",
...@@ -1995,9 +1996,13 @@ ...@@ -1995,9 +1996,13 @@
"Alternate1Description": "备用1说明", "Alternate1Description": "备用1说明",
"Alternate2Description": "备用2说明", "Alternate2Description": "备用2说明",
"YYYY-MM": "YYYY-MM", "YYYY-MM": "YYYY-MM",
"CurrentPeriodDebitBal":"本期借方发生额",
"CurrentPeriodCreditBal":"本期贷方发生额",
"profitLoss": "利润表", "profitLoss": "利润表",
"profitLossPRC": "利润表PRC", "profitLossPRC": "利润表PRC",
"profitLossPRCManual": "利润表PRC人工导入",
"ProfitLossTitle": "利润表", "ProfitLossTitle": "利润表",
"CurrentPeriodAmount": "本期发生额", "CurrentPeriodAmount": "本期发生额",
"ThisYearAccumulatedAmount": "本年累计", "ThisYearAccumulatedAmount": "本年累计",
...@@ -2010,6 +2015,7 @@ ...@@ -2010,6 +2015,7 @@
"offBalanceSheet" : "资产负债表", "offBalanceSheet" : "资产负债表",
"offBalanceSheetPRC": "资产负债表PRC", "offBalanceSheetPRC": "资产负债表PRC",
"offBalanceSheetPRCManual": "资产负债表PRC人工导入",
"OffBalanceSheetTitle" : "资产负债表", "OffBalanceSheetTitle" : "资产负债表",
"InitialBalance" : "年初余额", "InitialBalance" : "年初余额",
...@@ -2301,6 +2307,7 @@ ...@@ -2301,6 +2307,7 @@
"InputAllMandatoryInfo": "请输入所有必填信息", "InputAllMandatoryInfo": "请输入所有必填信息",
"NameShouldUniqueWarn": "收入类型名称应当唯一", "NameShouldUniqueWarn": "收入类型名称应当唯一",
"ProfitTable": "利润表",
"~MustBeEndOneApp": "我必须是最后一个！" "~MustBeEndOneApp": "我必须是最后一个！"
} }
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js
View file @ 74ff8e0d
...@@ -189,6 +189,9 @@ ...@@ -189,6 +189,9 @@
getCFDataForDisplay: function (queryParams) { getCFDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getCFDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getCFDataForDisplay', queryParams, apiConfig.createVat());
}, },
getCFManualDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getCFManualDataForDisplay', queryParams, apiConfig.createVat());
},
//服务器导出 //服务器导出
initExportCFData: function (queryParm, fileName) { initExportCFData: function (queryParm, fileName) {
var thisConfig = apiConfig.create(); var thisConfig = apiConfig.create();
...@@ -198,12 +201,51 @@ ...@@ -198,12 +201,51 @@
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx'); FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
}); });
}, },
initExportCFMData: function (queryParm, fileName) {
var thisConfig = apiConfig.create();
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportCFMData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
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) { getPLDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getPLDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getPLDataForDisplay', queryParams, apiConfig.createVat());
}, },
getPLStatementDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getPLStatementDataForDisplay', queryParams, apiConfig.createVat());
},
initExportPLData: function (queryParams) { initExportPLData: function (queryParams) {
return $http.post('/dataPreview/exportPLData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' })); 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');
});
},
initExportPLStatementData: function (queryParams) {
return $http.post('/dataPreview/exportPLStatementData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
},
getJEDataForDisplay: function (queryParams) { getJEDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getJEDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getJEDataForDisplay', queryParams, apiConfig.createVat());
}, },
...@@ -213,9 +255,28 @@ ...@@ -213,9 +255,28 @@
getBSDataForDisplay: function (queryParams) { getBSDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getBSDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getBSDataForDisplay', queryParams, apiConfig.createVat());
}, },
getBalanceSheetDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getBalanceSheetDataForDisplay', queryParams, apiConfig.createVat());
},
initExportBSData: function (queryParams) { initExportBSData: function (queryParams) {
return $http.post('/dataPreview/exportBSData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' })); 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');
});
},
initExportBalanceSheetData: function (queryParams) {
return $http.post('/dataPreview/exportBalanceSheetData/get', queryParams, apiConfig.create({ responseType: 'arraybuffer' }));
},
getIRDataForDisplay: function (queryParams) { getIRDataForDisplay: function (queryParams) {
return $http.post('/dataPreview/getIRDataForDisplay', queryParams, apiConfig.createVat()); return $http.post('/dataPreview/getIRDataForDisplay', queryParams, apiConfig.createVat());
}, },
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ 74ff8e0d
...@@ -881,6 +881,10 @@ ...@@ -881,6 +881,10 @@
constant.vatPermission.dataPreview.redLetterInformationTable.queryCode, constant.vatPermission.dataPreview.redLetterInformationTable.queryCode,
constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode, constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode,
constant.vatPermission.dataPreview.invoiceData.queryCode, constant.vatPermission.dataPreview.invoiceData.queryCode,
constant.vatPermission.dataPreview.profitTable.queryCode,
constant.vatPermission.dataPreview.balanceSheet.queryCode,
constant.vatPermission.dataPreview.cashFlowManual.queryCode,
constant.vatPermission.dataManage.caculateDataCode, constant.vatPermission.dataManage.caculateDataCode,
constant.vatPermission.dataManage.revenueDetailCode, constant.vatPermission.dataManage.revenueDetailCode,
...@@ -926,7 +930,13 @@ ...@@ -926,7 +930,13 @@
$state.go('vat.previewData.coupaPurchasingReport'); $state.go('vat.previewData.coupaPurchasingReport');
} else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) { } else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
$state.go('vat.previewData.invoiceData'); $state.go('vat.previewData.invoiceData');
} else if (data[constant.vatPermission.dataManage.caculateDataCode]) { } else if (data[constant.vatPermission.dataPreview.cashFlowManual.queryCode]) {
$state.go('vat.previewData.cashFlowManual');
} else if (data[constant.vatPermission.dataPreview.profitTable.queryCode]) {
$state.go('vat.previewData.vatPreviewProfitTable');
} else if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
$state.go('vat.previewData.vatPreviewTheBalanceSheet');
}else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
$state.go('vat.reductionData.caculateData'); $state.go('vat.reductionData.caculateData');
} else if (data[constant.vatPermission.dataManage.revenueDetailCode]) { } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
$state.go('vat.reductionData.revenueDetail'); $state.go('vat.reductionData.revenueDetail');
...@@ -973,36 +983,7 @@ ...@@ -973,36 +983,7 @@
// $state.go('vat.reductionData.goodsMapping'); // $state.go('vat.reductionData.goodsMapping');
// } // }
//TODO 删除的部分
// if (data[constant.vatPermission.dataPreview.balanceSheet.queryCode]) {
// $state.go('vat.previewData.balanceSheet');
// }
// else if (data[constant.vatPermission.dataPreview.inputInvoice.queryCode]) {
// $state.go('vat.previewData.inputInvoice');
// } else if (data[constant.vatPermission.dataPreview.outputInvoice.queryCode]) {
// $state.go('vat.previewData.outputInvoice');
// }
// else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
// $state.go('vat.reductionData.caculateData');
// } else if (data[constant.vatPermission.dataManage.revenueDetailCode]) {
// $state.go('vat.reductionData.revenueDetail');
// } else if (data[constant.vatPermission.dataManage.billDetailCode]) {
// $state.go('vat.reductionData.billDetail');
// } /*else if (data[constant.vatPermission.dataManage.unbilledInvoiceCode]) {
// $state.go('vat.reductionData.unbilledInvoice');
// }*/ else if (data[constant.vatPermission.reportView.bsplCode] || data[constant.vatPermission.reportView.taxReturnCode]) {
// $state.go('vat.generateReport');
// } else if (data[constant.vatPermission.dataAnalysis.modelAnalysisCode]) {
// $state.go('vat.analyzeLayout.analyzeReport');
// } else if (data[constant.vatPermission.dataAnalysis.dashboard.dashboardCode]) {
// $state.go('analyzeOrganizeDashboard');
// }
//else if (data[constant.vatPermission.dataAnalysis.vatTaxDifferenceCode]) {
// $state.go('vat.analyzeLayout.vatTaxDifference');
//}
} }
}); });
} }
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab-search.html
View file @ 74ff8e0d
...@@ -5,60 +5,38 @@ ...@@ -5,60 +5,38 @@
<table class="table table-responsive"> <table class="table table-responsive">
<tr> <tr>
<td> <td>
<span translate="BillingContent"></span> <span translate="TBAccountCode"></span>
<input class="form-control input-width-small" id="certificationDateStart" ng-model="queryParams.certificationDateStart" />&nbsp;-&nbsp; <input class="form-control input-width-middle" type="text" id="segment3" ng-model="queryParams.segment3" />
<input class="form-control input-width-small" id="certificationDateEnd" ng-model="queryParams.certificationDateEnd" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span translate="ApplicationSector"></span> <span translate="AccountName"></span>
<input class="form-control input-width-middle" type="text" id="invoiceCode" ng-model="queryParams.invoiceCode" /> <input class="form-control input-width-middle" type="text" id="segment3Name" ng-model="queryParams.segment3Name" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span translate="ApplicationSector"></span> <span translate="ProfitCenterCode"></span>
<input class="form-control input-width-middle" type="text" id="invoiceNumber" ng-model="queryParams.invoiceNumber" /> <input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.segment5" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span translate="InvoiceCode"></span> <span translate="ProfitCenterName"></span>
<input class="form-control input-width-middle" type="text" id="sellerTaxNumber" ng-model="queryParams.sellerTaxNumber" /> <input class="form-control input-width-middle" type="text" id="segment5Name" ng-model="queryParams.segment5Name" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span translate="InvoiceNumber"></span> <span translate="ProductCode"></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-middle" type="text" id="segment6" ng-model="queryParams.segment6" />
<input class="form-control input-width-small" type="text" id="amountEnd" ng-model="queryParams.amountEnd" onkeyup="PWC.inputNumberFormat(this);" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span translate="InvoiceFPLXQuery"></span> <span translate="TBProductName"></span>
<div class="ui-select-has-border input-width-middle"> <input class="form-control input-width-middle" type="text" id="segment6Name" ng-model="queryParams.segment6Name" />
<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> </td>
</tr> </tr>
</table> </table>
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.html
View file @ 74ff8e0d
...@@ -5,18 +5,17 @@ ...@@ -5,18 +5,17 @@
popover-container="body" popover-auto-hide="true" data-overwrite="true" popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true" use-optimized-placement-algorithm="true"
data-placement="bottom" 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> <i class="fa fa-filter" aria-hidden="true"></i>
</button> </button>
<span translate="AdjustmentTableTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>： <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" /> <input type="text" id="periodDatepicker" class="datepicker imp-subheader form-control periodInput"
<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> style="position:relative;top:-30px;left:150px;width: 120px;"/>
</div> <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;
<div style="margin-bottom: 8px;margin-left: 30px"> <!-- <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 class="text-bold">&nbsp;&nbsp;&nbsp;合&nbsp;计&nbsp;：</span>&nbsp; <span ng-click="downloadAdjustmentTable()" style="margin-left: 45px; "><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
金额<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp; </div>
税额<span class="numAmount">{{totalTaxAmount}}</span>
</div> </div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0"> <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
...@@ -38,11 +37,11 @@ ...@@ -38,11 +37,11 @@
</div> </div>
<div id="mainAreaDiv" class="main-area"> <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 class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div> </div>
<div class="pagination-container"> <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 id="totalInvoicePage" class="common-pagination" style="display:none;">
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.less
View file @ 74ff8e0d
...@@ -123,7 +123,9 @@ ...@@ -123,7 +123,9 @@
} }
} }
.rightHeader{
text-align: right;
}
.popover { .popover {
min-width: 370px; min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual-search.html 0 → 100644
View file @ 74ff8e0d
<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-cash-flow-manual/vat-preview-cash-flow-manual.html 0 → 100644
View file @ 74ff8e0d
<div class="vat-preview-cash-flow-manual" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<span translate="CashFlowDDTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold"
translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle periodInput"
style="position: relative; top: -30px; width: 120px; left: 130px;" id="input-invoice-period-picker"/>
<span ng-click="downloadCashFlow()" style="position: relative; top: -13px; left: 95%;"><i
class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
{{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
{{'ImportTime' | translate }}：<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</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}}条记录，共{{queryIncomeInvoiceItemResult.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-cash-flow-manual/vat-preview-cash-flow-manual.js 0 → 100644
View file @ 74ff8e0d
vatModule.directive('vatPreviewCashFlowManual', ['$log', 'browserService', '$translate', 'region', '$timeout',
function ($log, browserService, $translate, region, $timeout) {
$log.debug('vatPreviewCashFlowManual.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.html' + '?_=' + Math.random(),
scope: {},
controller: 'VatPreviewCashFlowManualController',
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-search.html 0 → 100644
View file @ 74ff8e0d
<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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment