Skip to content

T
traffic-front
Commit 2ebc9c91 authored by zhkwei's avatar zhkwei
Browse files
Options

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

parents a589aa75 b2991ee2
Show whitespace changes
Inline Side-by-side
Showing with 269 additions and 94 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/dd/RedLetterInfoTableDto.java
View file @ 2ebc9c91
......@@ -50,6 +50,17 @@ public class RedLetterInfoTableDto implements Serializable {
*/
private String projectId;
/**
* Database Column Remarks:
* 期间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column red_letter_info_table.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 税务系统期间
......@@ -70,7 +81,7 @@ public class RedLetterInfoTableDto implements Serializable {
*
* @mbg.generated
*/
private Integer fillInDate;
private Date fillInDate;
/**
* Database Column Remarks:
......@@ -295,6 +306,30 @@ public class RedLetterInfoTableDto implements Serializable {
this.projectId = projectId == null ? null : projectId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column red_letter_info_table.period
*
* @return the value of red_letter_info_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 red_letter_info_table.period
*
* @param period the value for red_letter_info_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 red_letter_info_table.tms_period
......@@ -327,7 +362,7 @@ public class RedLetterInfoTableDto implements Serializable {
*
* @mbg.generated
*/
public Integer getFillInDate() {
public Date getFillInDate() {
return fillInDate;
}
......@@ -339,7 +374,7 @@ public class RedLetterInfoTableDto implements Serializable {
*
* @mbg.generated
*/
public void setFillInDate(Integer fillInDate) {
public void setFillInDate(Date fillInDate) {
this.fillInDate = fillInDate;
}
......@@ -670,6 +705,7 @@ public class RedLetterInfoTableDto implements Serializable {
sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId);
sb.append(", projectId=").append(projectId);
sb.append(", period=").append(period);
sb.append(", tmsPeriod=").append(tmsPeriod);
sb.append(", fillInDate=").append(fillInDate);
sb.append(", subjectNum=").append(subjectNum);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 2ebc9c91
......@@ -973,7 +973,7 @@ public class DataImportService extends BaseService {
OrganizationExample organizationExample = new OrganizationExample();
organizationExample.createCriteria().andCodeEqualTo(companyCode);
Integer period = rlits.get(0).getFillInDate();
Integer period = rlits.get(0).getPeriod();
List<Organization> orgs = organizationMapper.selectByExample(organizationExample);
DataImportLog dataImportLog = generalDataImportLog(rlits.get(0).getSubjectNum(),"", "",
......@@ -1536,7 +1536,8 @@ public class DataImportService extends BaseService {
rlit.setSubjectNum(getCellStringValue(row.getCell(0)));
rlit.setSubjectName(getCellStringValue(row.getCell(1)));
rlit.setRedLetterInvoiceInfoTableNum(getCellStringValue(row.getCell(2)));
rlit.setFillInDate(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
rlit.setPeriod(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
rlit.setFillInDate(row.getCell(3).getDateCellValue());
rlit.setSalesTaxNumber(getCellStringValue(row.getCell(4)));
rlit.setSalespersonName(getCellStringValue(row.getCell(5)));
rlit.setTotalAmount(getCellBigDecimalValue(row.getCell(6)));
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java
View file @ 2ebc9c91
......@@ -1046,13 +1046,19 @@ public class UserServiceImpl extends AbstractService {
if(data.size()<1){
throw new ServiceException(ErrorMessage.ExportFailed);
}
data.forEach(d->{
for(UserRoleInfo d :data){
if(!d.getRoleInfoList().isEmpty()){
List<String> rList = d.getRoleInfoList().stream().map(RoleInfo::getName).collect(Collectors.toList());
d.setRoleList(JSON.toJSONString(rList));
}
d.setStatusStr(d.getStatus());
});
String statusStr = "";
if(d.getStatus() == 0){
statusStr = "禁用";
}else{
statusStr = "启用";
}
d.setStatusStr(statusStr);
}
OutputStream outputStream = commonDocumentHelper.toXlsxFileUsingJxls(data, excelTemplatePathInClassPath);
try {
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 2ebc9c91
......@@ -365,7 +365,8 @@ public class ReportServiceImpl extends BaseService {
}
@Transactional
public void assemblePeriodTemplate(Template template, Workbook workbook, String projectId, Integer period, Integer addRowIndex) throws ServiceException {
public void assemblePeriodTemplate(Template template, Workbook workbook, String projectId, Integer period, List<Long> configIds) throws ServiceException {
int addRowIndex = configIds.size();
List<Integer> hasHandDatas = Arrays.asList(
TaxesCalculateReportEnum.Column.Column_5.getIndex(),
TaxesCalculateReportEnum.Column.Column_6.getIndex(),
......@@ -394,7 +395,11 @@ public class ReportServiceImpl extends BaseService {
}
if (r <= addRowIndex+1) {
String cellId = projectId+template.getId()+period+r+c;
if((r-1)>=0&&(r-1)<configIds.size()){
cellId += configIds.get(r-1);
}
Long cellTemplateId = Long.valueOf(cellId.hashCode());
cellTemplateId = cellTemplateId<0?cellTemplateId:(cellTemplateId*-1);
PeriodCellTemplate cellTemplate = new PeriodCellTemplate();
cellTemplate.setPeriod(period);
cellTemplate.setRowName(POIUtil.getCellFormulaString(cell));
......@@ -728,6 +733,7 @@ public class ReportServiceImpl extends BaseService {
String queryDate = project.getYear()+"-"+(period>=10?period:("0"+period));
example.createCriteria().andOrgIdEqualTo(project.getOrganizationId()).
andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate).andStatusEqualTo(0);
example.setOrderByClause(" create_time ");
List<RevenueConfig> dataList = revenueConfigMapper.selectByExample(example);
//合计项map
Map<Integer,List<String>> sumMap = new HashMap<>();
......@@ -736,14 +742,17 @@ public class ReportServiceImpl extends BaseService {
sumMap.put(TaxesCalculateReportEnum.Column.Column_7.getIndex(),new ArrayList<>());
sumMap.put(TaxesCalculateReportEnum.Column.Column_8.getIndex(),new ArrayList<>());
sumMap.put(TaxesCalculateReportEnum.Column.Column_10.getIndex(),new ArrayList<>());
List<Long> configIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(dataList)) {
int rowIndex = 1;
Row sourceRow = sheet.getRow(3);
for (RevenueConfig config : dataList) {
configIds.add(config.getId());
Row row = POIUtil.createAndCloneRow(tWorkbook, sheet, 1, sourceRow);
row.getCell(TaxesCalculateReportEnum.Column.Column_1.getIndex()).setCellValue("1-" + rowIndex);
row.getCell(TaxesCalculateReportEnum.Column.Column_1.getIndex()).setCellValue("1-" + (dataList.size()+1-rowIndex));
row.getCell(TaxesCalculateReportEnum.Column.Column_2.getIndex()).setCellValue(config.getName());
row.getCell(TaxesCalculateReportEnum.Column.Column_3.getIndex()).setCellValue("");
row.getCell(TaxesCalculateReportEnum.Column.Column_4.getIndex()).setCellValue("PC(\"FilterDate1\",2)");
......@@ -764,13 +773,13 @@ public class ReportServiceImpl extends BaseService {
if (1 == config.getTaxBase()) {//账载
row.getCell(TaxesCalculateReportEnum.Column.Column_8.getIndex()).setCellValue("WPNAME(\"VAT020\",\"B\",\""+config.getName()+"\",\"E\")");
} else if (2 == config.getTaxBase()) {//开票收入
row.getCell(TaxesCalculateReportEnum.Column.Column_8.getIndex()).setCellValue("WPNAME(\"VAT020\",\"B\",\""+config.getName()+"\",\"F\")+"
+"WPNAME(\"VAT020\",\"B\",\""+config.getName()+"\",\"G\")");
} else if (3 == config.getTaxBase()) {//手工录入
} else if (4 == config.getTaxBase()) {//借方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_8.getIndex()).setCellValue("JFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
} else if (5 == config.getTaxBase()) {//贷方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_8.getIndex()).setCellValue("DFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
}else{
row.getCell(TaxesCalculateReportEnum.Column.Column_8.getIndex()).setCellValue("");
......@@ -791,7 +800,7 @@ public class ReportServiceImpl extends BaseService {
//组装合计项数据
assembleSumRow(sheet.getRow(rowIndex),sumMap);
}
assemblePeriodTemplate(template, tWorkbook, projectId, period, dataList.size());
assemblePeriodTemplate(template, tWorkbook, projectId, period, configIds);
return tWorkbook;
}
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
View file @ 2ebc9c91
package pwc.taxtech.atms.vat.service.impl.report.functions;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.eval.NumberEval;
......@@ -20,6 +19,7 @@ import pwc.taxtech.atms.vat.entity.RevenueTypeMapping;
import pwc.taxtech.atms.vat.entity.RevenueTypeMappingExample;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
......@@ -42,17 +42,17 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
Integer billType = getIntParam(args[1], ec);//发票类型
String formulaExpression = "KPSR(\"" + revenueTypeName + "\","+billType+")";
logger.debug(formulaExpression);
List<OutputInvoiceDataSourceDto> dataSource = Lists.newArrayList();
double result = countForTrialBalance(revenueTypeName,dataSource,billType,ec);
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource), FormulaDataSourceDetailType.InputInvoiceDataSourceDto, new BigDecimal(result), formulaContext.getPeriod(),
List<OutputInvoiceDataSourceDto> dataSource = new ArrayList<>();
double result = assembleData(revenueTypeName,dataSource,billType,ec);
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource), FormulaDataSourceDetailType.OutputInvoiceDataSourceDto, new BigDecimal(result), formulaContext.getPeriod(),
formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
saveFormulaBlock(formulaContext.getPeriod(), ec, formulaExpression, new BigDecimal(result), dataSoureId, formulaContext.getProjectId());
return new NumberEval(result);
}
private double countForTrialBalance(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType,OperationEvaluationContext ec) {
private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType,OperationEvaluationContext ec) {
String queryDate = formulaContext.getYear()+(formulaContext.getPeriod()<10?("0"+formulaContext.getPeriod()):(formulaContext.getPeriod()+""));
RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPNAME.java
View file @ 2ebc9c91
......@@ -70,7 +70,7 @@ public class WPNAME extends FunctionBase implements FreeRefFunction {
throw e;
} finally {
LOGGER.warn("[BB_Exception] error for bb cacls for {}", bo.toString());
Long dataSourceId = saveDataSource(ec, dataSource, FormulaDataSourceType.Other,FormulaDataSourceDetailType.TaxCellDataSourceDto,
Long dataSourceId = saveDataSource(ec, dataSource, FormulaDataSourceType.Report,FormulaDataSourceDetailType.ReportCellDataSourceDto,
cellValue, formulaContext.getPeriod(),
formulaContext.getReportTemplateGroupId(), cellTemplateData.getColumnIndex(), cellTemplateData.getRowIndex(),
formulaContext.getProjectId());
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserRoleInfo.java
View file @ 2ebc9c91
......@@ -248,11 +248,4 @@ public class UserRoleInfo {
public void setStatusStr(String statusStr) {
this.statusStr = statusStr;
}
public void setStatusStr(Integer status) {
if(status == 0){
this.statusStr = "禁用";
}
this.statusStr = "启用";
}
}
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/RedLetterInfoTable.java
View file @ 2ebc9c91
......@@ -46,6 +46,17 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
*/
private String projectId;
/**
* Database Column Remarks:
* 期间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column red_letter_info_table.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 税务系统期间
......@@ -66,7 +77,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
private Integer fillInDate;
private Date fillInDate;
/**
* Database Column Remarks:
......@@ -291,6 +302,30 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
this.projectId = projectId == null ? null : projectId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column red_letter_info_table.period
*
* @return the value of red_letter_info_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 red_letter_info_table.period
*
* @param period the value for red_letter_info_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 red_letter_info_table.tms_period
......@@ -323,7 +358,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public Integer getFillInDate() {
public Date getFillInDate() {
return fillInDate;
}
......@@ -335,7 +370,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public void setFillInDate(Integer fillInDate) {
public void setFillInDate(Date fillInDate) {
this.fillInDate = fillInDate;
}
......@@ -666,6 +701,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId);
sb.append(", projectId=").append(projectId);
sb.append(", period=").append(period);
sb.append(", tmsPeriod=").append(tmsPeriod);
sb.append(", fillInDate=").append(fillInDate);
sb.append(", subjectNum=").append(subjectNum);
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/RedLetterInfoTableExample.java
View file @ 2ebc9c91
......@@ -396,6 +396,66 @@ public class RedLetterInfoTableExample {
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
}
public Criteria andPeriodIsNotNull() {
addCriterion("period is not null");
return (Criteria) this;
}
public Criteria andPeriodEqualTo(Integer value) {
addCriterion("period =", value, "period");
return (Criteria) this;
}
public Criteria andPeriodNotEqualTo(Integer value) {
addCriterion("period <>", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThan(Integer value) {
addCriterion("period >", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("period >=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThan(Integer value) {
addCriterion("period <", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThanOrEqualTo(Integer value) {
addCriterion("period <=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodIn(List<Integer> values) {
addCriterion("period in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodNotIn(List<Integer> values) {
addCriterion("period not in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodBetween(Integer value1, Integer value2) {
addCriterion("period between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("period not between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andTmsPeriodIsNull() {
addCriterion("tms_period is null");
return (Criteria) this;
......@@ -466,52 +526,52 @@ public class RedLetterInfoTableExample {
return (Criteria) this;
}
public Criteria andFillInDateEqualTo(Integer value) {
public Criteria andFillInDateEqualTo(Date value) {
addCriterion("fill_in_date =", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateNotEqualTo(Integer value) {
public Criteria andFillInDateNotEqualTo(Date value) {
addCriterion("fill_in_date <>", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateGreaterThan(Integer value) {
public Criteria andFillInDateGreaterThan(Date value) {
addCriterion("fill_in_date >", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateGreaterThanOrEqualTo(Integer value) {
public Criteria andFillInDateGreaterThanOrEqualTo(Date value) {
addCriterion("fill_in_date >=", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateLessThan(Integer value) {
public Criteria andFillInDateLessThan(Date value) {
addCriterion("fill_in_date <", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateLessThanOrEqualTo(Integer value) {
public Criteria andFillInDateLessThanOrEqualTo(Date value) {
addCriterion("fill_in_date <=", value, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateIn(List<Integer> values) {
public Criteria andFillInDateIn(List<Date> values) {
addCriterion("fill_in_date in", values, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateNotIn(List<Integer> values) {
public Criteria andFillInDateNotIn(List<Date> values) {
addCriterion("fill_in_date not in", values, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateBetween(Integer value1, Integer value2) {
public Criteria andFillInDateBetween(Date value1, Date value2) {
addCriterion("fill_in_date between", value1, value2, "fillInDate");
return (Criteria) this;
}
public Criteria andFillInDateNotBetween(Integer value1, Integer value2) {
public Criteria andFillInDateNotBetween(Date value1, Date value2) {
addCriterion("fill_in_date not between", value1, value2, "fillInDate");
return (Criteria) this;
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/RedLetterInfoTableMapper.xml
View file @ 2ebc9c91
......@@ -9,8 +9,9 @@
<id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
<result column="fill_in_date" jdbcType="INTEGER" property="fillInDate" />
<result column="fill_in_date" jdbcType="TIMESTAMP" property="fillInDate" />
<result column="subject_num" jdbcType="VARCHAR" property="subjectNum" />
<result column="subject_name" jdbcType="VARCHAR" property="subjectName" />
<result column="red_letter_invoice_info_table_num" jdbcType="VARCHAR" property="redLetterInvoiceInfoTableNum" />
......@@ -96,7 +97,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, tms_period, fill_in_date, subject_num, subject_name,
id, organization_id, project_id, period, tms_period, fill_in_date, subject_num, subject_name,
red_letter_invoice_info_table_num, sales_tax_number, salesperson_name, total_amount,
total_tax_amount, application_description, applicant_manager, invoice_code, invoice_number,
create_time, update_time
......@@ -153,15 +154,15 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into red_letter_info_table (id, organization_id, project_id,
tms_period, fill_in_date, subject_num,
subject_name, red_letter_invoice_info_table_num,
period, tms_period, fill_in_date,
subject_num, subject_name, red_letter_invoice_info_table_num,
sales_tax_number, salesperson_name, total_amount,
total_tax_amount, application_description,
applicant_manager, invoice_code, invoice_number,
create_time, update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{tmsPeriod,jdbcType=INTEGER}, #{fillInDate,jdbcType=INTEGER}, #{subjectNum,jdbcType=VARCHAR},
#{subjectName,jdbcType=VARCHAR}, #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER}, #{tmsPeriod,jdbcType=INTEGER}, #{fillInDate,jdbcType=TIMESTAMP},
#{subjectNum,jdbcType=VARCHAR}, #{subjectName,jdbcType=VARCHAR}, #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},
#{salesTaxNumber,jdbcType=VARCHAR}, #{salespersonName,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL},
#{totalTaxAmount,jdbcType=DECIMAL}, #{applicationDescription,jdbcType=VARCHAR},
#{applicantManager,jdbcType=VARCHAR}, #{invoiceCode,jdbcType=VARCHAR}, #{invoiceNumber,jdbcType=VARCHAR},
......@@ -183,6 +184,9 @@
<if test="projectId != null">
project_id,
</if>
<if test="period != null">
period,
</if>
<if test="tmsPeriod != null">
tms_period,
</if>
......@@ -239,11 +243,14 @@
<if test="projectId != null">
#{projectId,jdbcType=VARCHAR},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
<if test="tmsPeriod != null">
#{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="fillInDate != null">
#{fillInDate,jdbcType=INTEGER},
#{fillInDate,jdbcType=TIMESTAMP},
</if>
<if test="subjectNum != null">
#{subjectNum,jdbcType=VARCHAR},
......@@ -312,11 +319,14 @@
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=VARCHAR},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
<if test="record.tmsPeriod != null">
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
</if>
<if test="record.fillInDate != null">
fill_in_date = #{record.fillInDate,jdbcType=INTEGER},
fill_in_date = #{record.fillInDate,jdbcType=TIMESTAMP},
</if>
<if test="record.subjectNum != null">
subject_num = #{record.subjectNum,jdbcType=VARCHAR},
......@@ -371,8 +381,9 @@
set id = #{record.id,jdbcType=BIGINT},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
project_id = #{record.projectId,jdbcType=VARCHAR},
period = #{record.period,jdbcType=INTEGER},
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
fill_in_date = #{record.fillInDate,jdbcType=INTEGER},
fill_in_date = #{record.fillInDate,jdbcType=TIMESTAMP},
subject_num = #{record.subjectNum,jdbcType=VARCHAR},
subject_name = #{record.subjectName,jdbcType=VARCHAR},
red_letter_invoice_info_table_num = #{record.redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},
......@@ -403,11 +414,14 @@
<if test="projectId != null">
project_id = #{projectId,jdbcType=VARCHAR},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
<if test="tmsPeriod != null">
tms_period = #{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="fillInDate != null">
fill_in_date = #{fillInDate,jdbcType=INTEGER},
fill_in_date = #{fillInDate,jdbcType=TIMESTAMP},
</if>
<if test="subjectNum != null">
subject_num = #{subjectNum,jdbcType=VARCHAR},
......@@ -459,8 +473,9 @@
update red_letter_info_table
set organization_id = #{organizationId,jdbcType=VARCHAR},
project_id = #{projectId,jdbcType=VARCHAR},
period = #{period,jdbcType=INTEGER},
tms_period = #{tmsPeriod,jdbcType=INTEGER},
fill_in_date = #{fillInDate,jdbcType=INTEGER},
fill_in_date = #{fillInDate,jdbcType=TIMESTAMP},
subject_num = #{subjectNum,jdbcType=VARCHAR},
subject_name = #{subjectName,jdbcType=VARCHAR},
red_letter_invoice_info_table_num = #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 2ebc9c91
......@@ -1157,6 +1157,8 @@
"StartRowNumberCheckMsg": "Starting Rows Should Not be Greater Than the Total Number of Currently Imported Data!",
"StartingDate": "Start Date",
"EndDate": "End Date",
"StartingPeriod": "Start Period",
"EndPeriod": "End Period",
"StatesColon": "States:",
"Status": "Status",
"StdAccountMappingResult": "Standard Account Mapping Result...",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 2ebc9c91
......@@ -1513,6 +1513,8 @@
"StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！",
"StartingDate": "开始日期",
"EndDate": "结束日期",
"StartingPeriod": "期间从",
"EndPeriod": "期间至",
"StatusColon": "状态:",
"StdAccountMappingResult": "标准科目对应结果",
"StdAccountNotLeaf": "请选择叶子节点",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 2ebc9c91
......@@ -1190,13 +1190,13 @@
allowHeaderFiltering: false,
width: '20%',
dataType: "date",
caption: $translate.instant('StartingDate')
caption: $translate.instant('StartingPeriod')
}, {
dataField: "endDate",
allowHeaderFiltering: false,
width: '20%',
dataType: "date",
caption: $translate.instant('EndDate')
caption: $translate.instant('EndPeriod')
}, {
dataField: "rate",
allowHeaderFiltering: false,
......@@ -1344,6 +1344,11 @@
dataField: "approvedLevyProject",
allowHeaderFiltering: false,
caption: $translate.instant('ApprovedLevyProject'),
lookup: {
dataSource: constant.GroupTypeList,
displayExpr: "type",
valueExpr: "type"
},
width: '15%'
}, {
dataField: "approvedValidityPeriodStartTime",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less
View file @ 2ebc9c91
......@@ -549,6 +549,7 @@
.leftUp {
width: 50%;
margin-bottom: -40px;
}
.rightUp {
......
atms-web/src/main/webapp/app/admin/infrastructure/userManageList/user-manage-list.ctrl.js
View file @ 2ebc9c91
......@@ -969,7 +969,7 @@
var doExport = function () {
var localDate=$filter('date')(new Date(), 'yyyyMMddHHmmss');
var fileName = '用户信息列表'+localDate;
userService.downloadFile($scope.originalUserRoleList,fileName).then(function (data) {
userService.downloadFile($scope.userRoleList,fileName).then(function (data) {
if (data) {
ackMessageBox.success(translate('FileExportSuccess'));
}
......
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @ 2ebc9c91
......@@ -696,14 +696,22 @@
+ '&nbsp;&nbsp;&nbsp;&nbsp;' + evalVal.formatAmount(precition));
}
else { // For 报表数据源 and BSPL数据源
if ($scope.detail.dataGridSource && $scope.detail.dataGridSource.length > 0) {
//判断是否是动态生成sheet
if(new Number($scope.detail.cellTemplateId)<0){
$("#dataGridFooterSummary").html("");
}else{
evalVal = _.reduce($scope.detail.dataGridSource, function (memo, x) {
return memo + x.cellValue;
}, 0);
$("#dataGridFooterSummary").html($translate.instant('Conclusion') +
'&nbsp;&nbsp;&nbsp;&nbsp;' + evalVal.formatAmount(precition));
}
}
else {
var summaryExp = '';
if (isShowCellNameSummary && !_.isEmpty($scope.detail.summaryExp)
......@@ -1209,13 +1217,13 @@
alignment: 'left',
width: '16%'
},
{dataField: 'project', caption: $translate.instant('Project'), alignment: 'left', width: '25%'},
{
dataField: 'reportColumn',
caption: $translate.instant('TaxReportColumn'),
alignment: 'left',
width: '17%'
},
// {dataField: 'project', caption: $translate.instant('Project'), alignment: 'left', width: '25%'},
// {
// dataField: 'reportColumn',
// caption: $translate.instant('TaxReportColumn'),
// alignment: 'left',
// width: '17%'
// },
{
dataField: 'cellName',
caption: $translate.instant('CellColumn'),
......
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html
View file @ 2ebc9c91
......@@ -34,14 +34,14 @@
<label class="cell-info-subject-label">{{'CellColumn' | translate}}：</label>
{{numToExcelChar(detail.rowIndex, detail.columnIndex)}}
</div>
<div class="cell-info-subject">
<label class="cell-info-subject-label">{{'RowName' | translate}}：</label>
{{detail.cellInfo.project}}
</div>
<div class="cell-info-subject">
<label class="cell-info-subject-label">{{'ColumnName' | translate}}：</label>
{{detail.cellInfo.column}}
</div>
<!--<div class="cell-info-subject">-->
<!--<label class="cell-info-subject-label">{{'RowName' | translate}}：</label>-->
<!--{{detail.cellInfo.project}}-->
<!--</div>-->
<!--<div class="cell-info-subject">-->
<!--<label class="cell-info-subject-label">{{'ColumnName' | translate}}：</label>-->
<!--{{detail.cellInfo.column}}-->
<!--</div>-->
<div class="cell-info-subject">
<label class="cell-info-subject-label">{{'Formula' | translate}}</label>
<formula-translator formula-list="formulaList" key-value-list="keyValueList" include-optional="false"
......
atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js
View file @ 2ebc9c91
......@@ -620,12 +620,12 @@
//todo: according to element to get the detail data
var outItems;
var convert = false;
if (element.items.length === 1) {
outItems = JSON.parse(element.items[0]);
} else {
// if (element.items.length === 1) {
// outItems = JSON.parse(element.items[0]);
// } else {
outItems = element.items;
convert = true;
}
// }
//todo: according to element to get the detail data
angular.forEach(outItems, function (jsonData) {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 2ebc9c91
......@@ -1444,10 +1444,11 @@ constant.TaxDecCycleList = [
];
constant.ApprovedLevyTermList = [
{code:0,type:"月"},
{code:1,type:"季"},
{code:2,type:"半年"},
{code:3,type:"年"}
{code:0,type:"次"},
{code:1,type:"月"},
{code:2,type:"季"},
{code:3,type:"半年"},
{code:4,type:"年"}
];
constant.TaxpayerQualificationTypeList = [
......
atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
View file @ 2ebc9c91
......@@ -385,14 +385,14 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
}
if (data[constant.vatPermission.dataAnalysis.modelAnalysisCode]) {
$scope.menus.push({
name: 'analyzeLayout', state: 'analyzeLayout', num: 5,
permission: constant.vatPermission.dataAnalysis.dataAnalysisCode, url: '#/vat/analyzeLayout'
});
subMenus.push({
name: 'analyzeLayout.analyzeReport', state: 'analyzeLayout.analyzeReport', num: 5,
permission: constant.vatPermission.dataAnalysis.modelAnalysisCode, url: '#/vat/analyzeLayout/analyzeReport'
});
// $scope.menus.push({
// name: 'analyzeLayout', state: 'analyzeLayout', num: 5,
// permission: constant.vatPermission.dataAnalysis.dataAnalysisCode, url: '#/vat/analyzeLayout'
// });
// subMenus.push({
// name: 'analyzeLayout.analyzeReport', state: 'analyzeLayout.analyzeReport', num: 5,
// permission: constant.vatPermission.dataAnalysis.modelAnalysisCode, url: '#/vat/analyzeLayout/analyzeReport'
// });
}
//else if (data[constant.vatPermission.dataAnalysis.dashboard.dashboardCode]) {
// $scope.menus.push({
......@@ -406,14 +406,14 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
//}
else {
//data[constant.vatPermission.dataAnalysis.vatTaxDifferenceCode]
$scope.menus.push({
name: 'analyzeLayout', state: 'analyzeLayout', num: 5,
permission: constant.vatPermission.dataAnalysis.dataAnalysisCode, url: '#/vat/analyzeLayout'
});
subMenus.push({
name: 'analyzeLayout.vatTaxDifference', state: 'analyzeLayout.vatTaxDifference', num: 5,
permission: constant.vatPermission.dataAnalysis.vatTaxDifferenceCode, url: '#/analyzeLayout/vatTaxDifference'
});
// $scope.menus.push({
// name: 'analyzeLayout', state: 'analyzeLayout', num: 5,
// permission: constant.vatPermission.dataAnalysis.dataAnalysisCode, url: '#/vat/analyzeLayout'
// });
// subMenus.push({
// name: 'analyzeLayout.vatTaxDifference', state: 'analyzeLayout.vatTaxDifference', num: 5,
// permission: constant.vatPermission.dataAnalysis.vatTaxDifferenceCode, url: '#/analyzeLayout/vatTaxDifference'
// });
}
}
});
......
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