diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 3c5c44a..cdf6ab5 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -19,6 +19,7 @@ + diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 3c5c44a..cdf6ab5 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -19,6 +19,7 @@ + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 9a2d7b1..1bc658b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -68,7 +68,7 @@ /** * 合同种类-收入合同/支出合同-字典 */ - @DictCodeField(message = "分包原因不合法", cacheName = MeterDictCode.AGREEMENT_KIND) + @DictCodeField(message = "合同种类不合法", cacheName = MeterDictCode.AGREEMENT_KIND) @ApiModelProperty(value = "合同种类-收入合同/支出合同-字典code", dataType = "String") @TableField("agreement_kind") private String agreementKind; @@ -81,7 +81,7 @@ /** * 合同类型-采购合同/业务合同等-字典 */ - @DictCodeField(message = "分包原因不合法", cacheName = MeterDictCode.AGREEMENT_TYPE) + @DictCodeField(message = "合同类型不合法", cacheName = MeterDictCode.AGREEMENT_TYPE) @ApiModelProperty(value = "合同类型-采购合同/业务合同等-字典code", dataType = "String") @TableField("agreement_type") private String agreementType; @@ -135,14 +135,14 @@ /** * 合同采购来源-字典code */ - @DictCodeField(message = "分包原因不合法", cacheName = MeterDictCode.AGREEMENT_SOURCE) + @DictCodeField(message = "合同采购来源不合法", cacheName = MeterDictCode.AGREEMENT_SOURCE) @ApiModelProperty(value = "合同采购来源-字典code", dataType = "String") @TableField("agreement_source") private String agreementSource; @ExcelProperty("合同采购来源") @ApiModelProperty(value = "合同采购来源-字典value", dataType = "String") - @TableField("agreement_source") + @TableField(exist = false) private String agreementSourceName; /** @@ -184,6 +184,13 @@ private String director; /** + * 负责人(收入合同该字段为乙方负责人,支出合同该字段为甲方负责人) + */ + @ApiModelProperty(value = "负责人(收入合同该字段为甲方负责人,支出合同该字段为乙方负责人)", dataType = "String") + @TableField("second_director") + private String secondDirector; + + /** * 单位(收入合同该字段为乙方单位,支出合同该字段为甲方单位) */ @ExcelProperty("乙方/甲方单位")