Skip to content

T
traffic-front
Commit 69de6bd6 authored by Ken you's avatar Ken you
Browse files
Options

fix 导入分发 追加和覆盖区分---Ken

parent 1f74d0af
Show whitespace changes
Inline Side-by-side
Showing with 462 additions and 54 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/DataImportLogDto.java
View file @ 69de6bd6
......@@ -215,6 +215,19 @@ public class DataImportLogDto implements Serializable {
*/
private Date updateTime;
/**
* Database Column Remarks:
* 导入类型
默认0；追加导入1；覆盖导入2；
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_import_log.import_type
*
* @mbg.generated
*/
private Integer importType;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_import_log
......@@ -623,12 +636,14 @@ public class DataImportLogDto implements Serializable {
this.recordSize = recordSize;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log
*
* @mbg.generated
*/
public Integer getImportType() {
return importType;
}
public void setImportType(Integer importType) {
this.importType = importType;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -637,6 +652,7 @@ public class DataImportLogDto implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId);
sb.append(", taxpayerIdNum=").append(taxpayerIdNum);
sb.append(", type=").append(type);
sb.append(", companyCode=").append(companyCode);
sb.append(", companyName=").append(companyName);
......@@ -649,8 +665,10 @@ public class DataImportLogDto implements Serializable {
sb.append(", operateTime=").append(operateTime);
sb.append(", importResult=").append(importResult);
sb.append(", errorMsg=").append(errorMsg);
sb.append(", recordSize=").append(recordSize);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", importType=").append(importType);
sb.append("]");
return sb.toString();
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 69de6bd6
......@@ -283,7 +283,8 @@ public class DataImportService extends BaseService {
EnumImportType.ProfitLoss.getCode(), period/100,
tmsPeriod%100, period%100,
companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
......@@ -460,6 +461,8 @@ public class DataImportService extends BaseService {
EnumImportType.BalanceSheet.getCode(), period/100,
tmsPeriod%100, period%100,
companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
......@@ -611,6 +614,8 @@ public class DataImportService extends BaseService {
EnumImportType.CashFlow.getCode(), period/100,
tmsPeriod%100, period%100,
companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
......@@ -767,6 +772,8 @@ public class DataImportService extends BaseService {
EnumImportType.InvoiceData.getCode(), period/100,
tmsPeriod%100, period%100,
companyName, fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
......@@ -978,7 +985,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, period%100,
rlits.get(0).getSubjectName(), "");
dataImportLog.setRecordSize(rlits.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false);
......@@ -1081,7 +1089,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, ats.get(0).getPeriod()%100,
ats.get(0).getSegment1Name(), "");
dataImportLog.setRecordSize(ats.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false);
......@@ -1185,7 +1194,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, cprs.get(0).getPeriod()%100,
"", "");
dataImportLog.setRecordSize(cprs.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false);
......@@ -1289,6 +1299,8 @@ public class DataImportService extends BaseService {
EnumImportType.CertifiedInvoicesList.getCode(), period/100,
tmsPeriod%100, period%100,
"", fileType);
//添加导入类型
dataImportLog.setImportType(importType);
if (organizations.size() < 1) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
......@@ -1453,7 +1465,8 @@ public class DataImportService extends BaseService {
tmsPeriod%100, irs.get(0).getPeriod()%100,
irs.get(0).getBillingBody(), "");
dataImportLog.setRecordSize(irs.size());
//添加导入类型
dataImportLog.setImportType(importType);
if(orgs.size()<1){
dataImportLog.setErrorMsg(ErrorMessageCN.NoCompanyError);
dataImportLog.setImportResult(false);
......
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ 69de6bd6
......@@ -41,11 +41,19 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator>
<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
<table tableName="data_import_log" domainObjectName="DataImportLog">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<!--<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">-->
<!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
<!--</table>-->
<!--<table tableName="cit_distribution" domainObjectName="CitDistribution">-->
<!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
......@@ -62,13 +70,7 @@
<columnOverride column="num_of_branches" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<table tableName="data_import_log" domainObjectName="DataImportLog">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="tms_period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<columnOverride column="period_month" javaType="java.lang.Integer" jdbcType="TINYINT"/>
</table>
<table tableName="organization_extra" domainObjectName="OrganizationExtra">
<property name="useActualColumnNames" value="false"/>
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/DataImportLogMapper.java
View file @ 69de6bd6
......@@ -106,5 +106,6 @@ public interface DataImportLogMapper extends MyMapper {
*/
int updateByPrimaryKey(DataImportLog record);
int displayOld(@Param("type") Integer type);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/DataImportLog.java
View file @ 69de6bd6
......@@ -220,6 +220,18 @@ public class DataImportLog extends BaseEntity implements Serializable {
*/
private Date updateTime;
/**
* Database Column Remarks:
* 导入类型
默认0；追加导入1；覆盖导入2；
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_import_log.import_type
*
* @mbg.generated
*/
private Integer importType;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_import_log
......@@ -684,6 +696,30 @@ public class DataImportLog extends BaseEntity implements Serializable {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_import_log.import_type
*
* @return the value of data_import_log.import_type
*
* @mbg.generated
*/
public Integer getImportType() {
return importType;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_import_log.import_type
*
* @param importType the value for data_import_log.import_type
*
* @mbg.generated
*/
public void setImportType(Integer importType) {
this.importType = importType;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_import_log
......@@ -715,6 +751,7 @@ public class DataImportLog extends BaseEntity implements Serializable {
sb.append(", display=").append(display);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", importType=").append(importType);
sb.append("]");
return sb.toString();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/DataImportLogExample.java
View file @ 69de6bd6
......@@ -1414,6 +1414,66 @@ public class DataImportLogExample {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andImportTypeIsNull() {
addCriterion("import_type is null");
return (Criteria) this;
}
public Criteria andImportTypeIsNotNull() {
addCriterion("import_type is not null");
return (Criteria) this;
}
public Criteria andImportTypeEqualTo(Integer value) {
addCriterion("import_type =", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeNotEqualTo(Integer value) {
addCriterion("import_type <>", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeGreaterThan(Integer value) {
addCriterion("import_type >", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("import_type >=", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeLessThan(Integer value) {
addCriterion("import_type <", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeLessThanOrEqualTo(Integer value) {
addCriterion("import_type <=", value, "importType");
return (Criteria) this;
}
public Criteria andImportTypeIn(List<Integer> values) {
addCriterion("import_type in", values, "importType");
return (Criteria) this;
}
public Criteria andImportTypeNotIn(List<Integer> values) {
addCriterion("import_type not in", values, "importType");
return (Criteria) this;
}
public Criteria andImportTypeBetween(Integer value1, Integer value2) {
addCriterion("import_type between", value1, value2, "importType");
return (Criteria) this;
}
public Criteria andImportTypeNotBetween(Integer value1, Integer value2) {
addCriterion("import_type not between", value1, value2, "importType");
return (Criteria) this;
}
}
/**
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/DataImportLogMapper.xml
View file @ 69de6bd6
......@@ -25,6 +25,7 @@
<result column="display" jdbcType="BIT" property="display" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="import_type" jdbcType="INTEGER" property="importType" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -99,7 +100,7 @@
-->
id, organization_id, taxpayer_id_num, type, company_code, company_name, file_type,
period_year, tms_period_month, period_month, period_status, operator, operate_time,
import_result, error_msg, record_size, display, create_time, update_time
import_result, error_msg, record_size, display, create_time, update_time, import_type
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.DataImportLogExample" resultMap="BaseResultMap">
<!--
......@@ -158,14 +159,14 @@
period_month, period_status, operator,
operate_time, import_result, error_msg,
record_size, display, create_time,
update_time)
update_time, import_type)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{taxpayerIdNum,jdbcType=VARCHAR},
#{type,jdbcType=TINYINT}, #{companyCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{fileType,jdbcType=VARCHAR}, #{periodYear,jdbcType=INTEGER}, #{tmsPeriodMonth,jdbcType=TINYINT},
#{periodMonth,jdbcType=TINYINT}, #{periodStatus,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR},
#{operateTime,jdbcType=TIMESTAMP}, #{importResult,jdbcType=BIT}, #{errorMsg,jdbcType=VARCHAR},
#{recordSize,jdbcType=INTEGER}, #{display,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
#{updateTime,jdbcType=TIMESTAMP}, #{importType,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.DataImportLog">
<!--
......@@ -231,6 +232,9 @@
<if test="updateTime != null">
update_time,
</if>
<if test="importType != null">
import_type,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -290,6 +294,9 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="importType != null">
#{importType,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entity.DataImportLogExample" resultType="java.lang.Long">
......@@ -366,6 +373,9 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.importType != null">
import_type = #{record.importType,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -395,7 +405,8 @@
record_size = #{record.recordSize,jdbcType=INTEGER},
display = #{record.display,jdbcType=BIT},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
import_type = #{record.importType,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -461,6 +472,9 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="importType != null">
import_type = #{importType,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -487,7 +501,8 @@
record_size = #{recordSize,jdbcType=INTEGER},
display = #{display,jdbcType=BIT},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP},
import_type = #{importType,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.DataImportLogExample" resultMap="BaseResultMap">
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 69de6bd6
......@@ -1821,6 +1821,7 @@
"CoverImportBalanceSheet": "Overwrite import BS",
"AddImportBalanceSheet": "Expand import BS",
"TMSPeriod": "TMS Period",
"ImportType": "Import Type",
"cashFlow": "Cash Flow",
"CashFlowDDTitle": "Cash Flow",
"invoiceData": "Invoice Data",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 69de6bd6
......@@ -2076,8 +2076,7 @@
"CoverImportBalanceSheet": "覆盖导入资产负债表",
"AddImportBalanceSheet": "追加导入资产负债表",
"TMSPeriod": "税务系统期间",
"ImportType":"导入方式",
"invoiceData": "发票资料",
"InvoiceDataTitle": "发票资料",
"IDTotalAmount": "合计",
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ 69de6bd6
......@@ -846,7 +846,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -861,8 +861,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ 69de6bd6
......@@ -854,12 +854,12 @@
}, {
dataField: "periodYear",
allowHeaderFiltering: false,
width: '7%',
width: '5%',
caption: $translate.instant('YearPeriod')
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '8%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -874,8 +874,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js
View file @ 69de6bd6
......@@ -823,7 +823,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -838,8 +838,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ 69de6bd6
......@@ -263,7 +263,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -278,8 +278,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js
View file @ 69de6bd6
......@@ -259,8 +259,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js
View file @ 69de6bd6
......@@ -252,8 +252,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js
View file @ 69de6bd6
......@@ -251,8 +251,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
View file @ 69de6bd6
......@@ -267,8 +267,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js
View file @ 69de6bd6
......@@ -260,8 +260,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ 69de6bd6
......@@ -285,8 +285,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ 69de6bd6
......@@ -262,8 +262,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '20%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ 69de6bd6
......@@ -288,7 +288,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -303,8 +303,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js
View file @ 69de6bd6
......@@ -274,7 +274,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -289,8 +289,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ 69de6bd6
......@@ -272,7 +272,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -287,8 +287,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js
View file @ 69de6bd6
......@@ -274,7 +274,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -289,8 +289,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ 69de6bd6
......@@ -302,7 +302,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -317,8 +317,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/controls/import/import-template/import-template.ctrl.js
View file @ 69de6bd6
......@@ -839,7 +839,7 @@
}, {
dataField: "periodMonth",
allowHeaderFiltering: false,
width: '10%',
width: '5%',
caption: $translate.instant('TMSPeriod')
}, {
dataField: "periodMonth",
......@@ -854,8 +854,23 @@
}, {
dataField: "errorMsg",
allowHeaderFiltering: false,
width: '15%',
width: '10%',
caption: $translate.instant('Status')
}, {
dataField: "importType",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('ImportType'),
calculateDisplayValue: function (data) {
var importType1 = _.find(constant.importTypeList, function (item) {
return item.value == data.importType;
});
if (importType1) {
return importType1.name;
} else {
return '未知';
}
}
}
],
onContentReady: function (e) {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 69de6bd6
......@@ -45,6 +45,12 @@ constant.priority = {
high: 3
}
constant.importTypeList = [
{value:0,name:"默认导入"},
{value:1,name:"覆盖导入"},
{value:2,name:"追加导入"}
]
constant.customer = {
codeMaxLength: 50,
nameMaxLength: 100,
......
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