供应商保存报错修改
This commit is contained in:
+3
-3
@@ -134,10 +134,10 @@ public class BmsSupplierCompany extends BaseEntity
|
|||||||
@Excel(name = "注册详细地址")
|
@Excel(name = "注册详细地址")
|
||||||
private String registeredAddressDetail;
|
private String registeredAddressDetail;
|
||||||
|
|
||||||
/** 营业执照(oss_id) */
|
/** 营业执照图片URL(当前存服务器本地相对路径,后续可切换对象存储) */
|
||||||
private Long businessLicenseOssId;
|
private String businessLicenseUrl;
|
||||||
|
|
||||||
/** 其他附件(oss_id逗号分隔) */
|
/** 其他附件(文件相对路径逗号分隔,后续可切换对象存储) */
|
||||||
private String attachmentIds;
|
private String attachmentIds;
|
||||||
|
|
||||||
/** 删除标记(0正常 2删除) */
|
/** 删除标记(0正常 2删除) */
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="registeredCity" column="registered_city" />
|
<result property="registeredCity" column="registered_city" />
|
||||||
<result property="registeredDistrict" column="registered_district" />
|
<result property="registeredDistrict" column="registered_district" />
|
||||||
<result property="registeredAddressDetail" column="registered_address_detail" />
|
<result property="registeredAddressDetail" column="registered_address_detail" />
|
||||||
<result property="businessLicenseOssId" column="business_license_oss_id" />
|
<result property="businessLicenseUrl" column="business_license_url" />
|
||||||
<result property="attachmentIds" column="attachment_ids" />
|
<result property="attachmentIds" column="attachment_ids" />
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
@@ -327,7 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectBmsSupplierCompanyVo">
|
<sql id="selectBmsSupplierCompanyVo">
|
||||||
select company_id, supplier_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_oss_id, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_company
|
select company_id, supplier_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_company
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectBmsSupplierCompanyList" parameterType="com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany" resultMap="BmsSupplierCompanyResult">
|
<select id="selectBmsSupplierCompanyList" parameterType="com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany" resultMap="BmsSupplierCompanyResult">
|
||||||
@@ -379,7 +379,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="registeredCity != null">registered_city,</if>
|
<if test="registeredCity != null">registered_city,</if>
|
||||||
<if test="registeredDistrict != null">registered_district,</if>
|
<if test="registeredDistrict != null">registered_district,</if>
|
||||||
<if test="registeredAddressDetail != null">registered_address_detail,</if>
|
<if test="registeredAddressDetail != null">registered_address_detail,</if>
|
||||||
<if test="businessLicenseOssId != null">business_license_oss_id,</if>
|
<if test="businessLicenseUrl != null">business_license_url,</if>
|
||||||
<if test="attachmentIds != null">attachment_ids,</if>
|
<if test="attachmentIds != null">attachment_ids,</if>
|
||||||
<if test="remark != null">remark,</if>
|
<if test="remark != null">remark,</if>
|
||||||
<if test="createBy != null">create_by,</if>
|
<if test="createBy != null">create_by,</if>
|
||||||
@@ -415,7 +415,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="registeredCity != null">#{registeredCity},</if>
|
<if test="registeredCity != null">#{registeredCity},</if>
|
||||||
<if test="registeredDistrict != null">#{registeredDistrict},</if>
|
<if test="registeredDistrict != null">#{registeredDistrict},</if>
|
||||||
<if test="registeredAddressDetail != null">#{registeredAddressDetail},</if>
|
<if test="registeredAddressDetail != null">#{registeredAddressDetail},</if>
|
||||||
<if test="businessLicenseOssId != null">#{businessLicenseOssId},</if>
|
<if test="businessLicenseUrl != null">#{businessLicenseUrl},</if>
|
||||||
<if test="attachmentIds != null">#{attachmentIds},</if>
|
<if test="attachmentIds != null">#{attachmentIds},</if>
|
||||||
<if test="remark != null">#{remark},</if>
|
<if test="remark != null">#{remark},</if>
|
||||||
<if test="createBy != null">#{createBy},</if>
|
<if test="createBy != null">#{createBy},</if>
|
||||||
@@ -455,7 +455,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="registeredCity != null">registered_city = #{registeredCity},</if>
|
<if test="registeredCity != null">registered_city = #{registeredCity},</if>
|
||||||
<if test="registeredDistrict != null">registered_district = #{registeredDistrict},</if>
|
<if test="registeredDistrict != null">registered_district = #{registeredDistrict},</if>
|
||||||
<if test="registeredAddressDetail != null">registered_address_detail = #{registeredAddressDetail},</if>
|
<if test="registeredAddressDetail != null">registered_address_detail = #{registeredAddressDetail},</if>
|
||||||
<if test="businessLicenseOssId != null">business_license_oss_id = #{businessLicenseOssId},</if>
|
<if test="businessLicenseUrl != null">business_license_url = #{businessLicenseUrl},</if>
|
||||||
<if test="attachmentIds != null">attachment_ids = #{attachmentIds},</if>
|
<if test="attachmentIds != null">attachment_ids = #{attachmentIds},</if>
|
||||||
<if test="remark != null">remark = #{remark},</if>
|
<if test="remark != null">remark = #{remark},</if>
|
||||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||||
|
|||||||
@@ -1793,8 +1793,8 @@ CREATE TABLE `sup_supplier_company` (
|
|||||||
`registered_city` varchar(50) DEFAULT '' COMMENT '注册城市',
|
`registered_city` varchar(50) DEFAULT '' COMMENT '注册城市',
|
||||||
`registered_district` varchar(50) DEFAULT '' COMMENT '注册区县',
|
`registered_district` varchar(50) DEFAULT '' COMMENT '注册区县',
|
||||||
`registered_address_detail` varchar(200) DEFAULT '' COMMENT '注册详细地址',
|
`registered_address_detail` varchar(200) DEFAULT '' COMMENT '注册详细地址',
|
||||||
`business_license_oss_id` bigint(20) DEFAULT NULL COMMENT '营业执照(图片/PDF,关联sys_oss.oss_id)',
|
`business_license_url` varchar(500) DEFAULT NULL COMMENT '营业执照图片URL(服务器本地存储,后续可切换对象存储)',
|
||||||
`attachment_ids` varchar(1000) DEFAULT NULL COMMENT '其他附件(如章程、验资报告等,多个oss_id逗号分隔)',
|
`attachment_ids` varchar(1000) DEFAULT NULL COMMENT '其他附件(如章程、验资报告等,多个文件相对路径逗号分隔)',
|
||||||
`remark` varchar(500) DEFAULT NULL COMMENT '备注说明',
|
`remark` varchar(500) DEFAULT NULL COMMENT '备注说明',
|
||||||
`create_by` varchar(64) DEFAULT '' COMMENT '创建者',
|
`create_by` varchar(64) DEFAULT '' COMMENT '创建者',
|
||||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||||
|
|||||||
@@ -429,8 +429,8 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="营业执照" prop="businessLicenseOssId">
|
<el-form-item label="营业执照" prop="businessLicenseUrl">
|
||||||
<image-upload v-model="companyForm.businessLicenseOssId" :limit="1" :size="5" />
|
<image-upload v-model="companyForm.businessLicenseUrl" :limit="1" :size="5" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
@@ -778,7 +778,7 @@ function resetCompanyForm() {
|
|||||||
registeredCity: '',
|
registeredCity: '',
|
||||||
registeredDistrict: '',
|
registeredDistrict: '',
|
||||||
registeredAddressDetail: '',
|
registeredAddressDetail: '',
|
||||||
businessLicenseOssId: null,
|
businessLicenseUrl: '',
|
||||||
attachmentIds: '',
|
attachmentIds: '',
|
||||||
remark: ''
|
remark: ''
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user