修改：供应商对象新增字段：开票公司名称，开票公司税号，收货人，收货人电话，收货人地址，发货人，发货人电话，发货人地址。新增：新增SQL语句字段添加对应的新增字段的新增查询条件。

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSupplier.java

@@ -125,6 +125,12 @@ public class SysSupplier extends BaseEntity
     @Excel(name = "开户银行账号")
     private String bankAccount;
 
+    @Excel(name="开票公司名称")
+    private String invoiceCompanyName;
+
+    @Excel(name="开票公司税号")
+    private String companyTaxNumber;
+
     /** RMB注册资金 */
     @Excel(name = "RMB注册资金")
     private String rmbRegisteredCapital;
@@ -153,6 +159,21 @@ public class SysSupplier extends BaseEntity
     @Excel(name = "税率")
     private String taxRate;
 
+    @Excel(name = "发货人")
+    private String deliverPerson;
+    @Excel(name = "发货人电话")
+    private String deliverPersonPhone;
+
+    @Excel(name = "发货地址")
+    private String deliverAddress;
+
+    @Excel(name = "收货人")
+    private String receivePerson;
+    @Excel(name = "收货人电话")
+    private String receivePersonPhone;
+    @Excel(name = "收货地址")
+    private String receiveAddress;
+
     /** 流程实例ID */
     private String instanceId;
 
@@ -635,7 +656,69 @@ public class SysSupplier extends BaseEntity
         return taxRate;
     }
 
+    public String getInvoiceCompanyName() {
+        return invoiceCompanyName;
+    }
+
+    public void setInvoiceCompanyName(String invoiceCompanyName) {
+        invoiceCompanyName = invoiceCompanyName;
+    }
+
+    public String getCompanyTaxNumber() {
+        return companyTaxNumber;
+    }
+
+    public void setCompanyTaxNumber(String companyTaxNumber) {
+        this.companyTaxNumber = companyTaxNumber;
+    }
+
+    public String getDeliverPerson() {
+        return deliverPerson;
+    }
+
+    public void setDeliverPerson(String deliverPerson) {
+        this.deliverPerson = deliverPerson;
+    }
+
+    public String getDeliverPersonPhone() {
+        return deliverPersonPhone;
+    }
+
+    public void setDeliverPersonPhone(String deliverPersonPhone) {
+        this.deliverPersonPhone = deliverPersonPhone;
+    }
+
+    public String getDeliverAddress() {
+        return deliverAddress;
+    }
+
+    public void setDeliverAddress(String deliverAddress) {
+        this.deliverAddress = deliverAddress;
+    }
+
+    public String getReceivePerson() {
+        return receivePerson;
+    }
+
+    public void setReceivePerson(String receivePerson) {
+        this.receivePerson = receivePerson;
+    }
 
+    public String getReceivePersonPhone() {
+        return receivePersonPhone;
+    }
+
+    public void setReceivePersonPhone(String receivePersonPhone) {
+        this.receivePersonPhone = receivePersonPhone;
+    }
+
+    public String getReceiveAddress() {
+        return receiveAddress;
+    }
+
+    public void setReceiveAddress(String receiveAddress) {
+        this.receiveAddress = receiveAddress;
+    }
 
     @Override
     public String toString() {
@@ -672,6 +755,15 @@ public class SysSupplier extends BaseEntity
             .append("financialContact", getFinancialContact())
             .append("confirmTax", getConfirmTax())
             .append("taxRate", getTaxRate())
+            .append("InvoiceCompanyName", getInvoiceCompanyName())
+            .append("companyTaxNumber", getCompanyTaxNumber())
+            .append("deliverPerson", getDeliverPerson())
+            .append("deliverPersonPhone", getDeliverPersonPhone())
+            .append("deliverAddress", getDeliverAddress())
+            .append("receivePerson", getReceivePerson())
+            .append("receivePersonPhone", getReceivePersonPhone())
+            .append("receiveAddress",getReceiveAddress())
+
             .toString();
     }
 }

ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml

@@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="exchangeSettlementAccount"    column="exchange_settlement_account"/>
         <result property="depositBank"                  column="deposit_bank"               />
         <result property="bankAccount"                  column="bank_account"               />
+        <result property="invoiceCompanyName"           column="invoice_company_name"       />
+        <result property="companyTaxNumber"             column="company_tax_number"         />
         <result property="rmbRegisteredCapital"         column="rmb_registered_capital"     />
         <result property="industryCode"                 column="Industry_code"              />
         <result property="merchandiser"                 column="merchandiser"               />
@@ -41,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="financialContact"             column="financial_contact"          />
         <result property="confirmTax"                   column="confirm_tax"                />
         <result property="taxRate"                      column="tax_rate"                   />
+        <result property="receivePerson"                column="receive_person"             />
+        <result property="receivePersonPhone"           column="receive_person_phone"       />
+        <result property="receiveAddress"               column="receive_address"            />
         <result property="photoAttachId"                column="photo_attach_id"            />
         <result property="photoUrl"                     column="photo_url"                  />
         <result property="createBy"                     column="create_by"                  />
@@ -67,9 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                legal_representative, customer_contact, contact_number, customer_fax,
                customer_email, website, payment_terms, supplier_days, actual_payment_days,
                settlement_bank, exchange_settlement_account, deposit_bank, bank_account,
-               rmb_registered_capital, Industry_code, merchandiser, merchandiser_telephone,
+               invoice_company_name, company_tax_number,rmb_registered_capital, Industry_code,
-               financial_contact, confirm_tax, tax_rate, create_by,
+               merchandiser, merchandiser_telephone,financial_contact, confirm_tax, tax_rate,
-               create_time, update_by, update_time, remark,
+               receive_person, receive_person_phone, receive_address,
+               create_by,create_time, update_by, update_time, remark,
                instance_type, instance_id, restore_instance_id, cancel_instance_id, submit_instance_id,
                apply_title, apply_user, apply_time,del_flag
         from sys_supplier
@@ -83,8 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sup.legal_representative, sup.customer_contact, sup.contact_number, sup.customer_fax,
         sup.customer_email, sup.website, sup.payment_terms, sup.supplier_days, sup.actual_payment_days,
         sup.settlement_bank, sup.exchange_settlement_account, sup.deposit_bank, sup.bank_account,
-        sup.rmb_registered_capital, sup.Industry_code, sup.merchandiser, sup.merchandiser_telephone,
+        sup.invoice_company_name, sup.company_tax_number,sup.rmb_registered_capital, sup.Industry_code,
-        sup.financial_contact, sup.confirm_tax, sup.tax_rate, sup.first_add_time, sup.update_info_time,
+        sup.merchandiser, sup.merchandiser_telephone,sup.financial_contact, sup.confirm_tax, sup.tax_rate,
+        sup.receive_person, sup.receive_person_phone, sup.receive_address,sup.first_add_time, sup.update_info_time,
         sup.create_by, sup.create_time, sup.update_by, sup.update_time, sup.remark,sup.del_flag,
         sup.instance_type, sup.instance_id, sup.restore_instance_id, sup.cancel_instance_id, sup.submit_instance_id,
         sup.apply_title, sup.apply_user, sup.apply_time,p.dict_value as instance_type_name,file.url as photo_url
@@ -114,6 +121,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''"> and sup.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="customerContact != null  and customerContact != ''"> and sup.customer_contact like concat('%', #{customerContact}, '%')</if>
             <if test="merchandiser != null  and merchandiser != ''"> and sup.merchandiser like concat('%', #{merchandiser}, '%')</if>
+            <if test="deliverPerson != null and deliverPerson != ''"> or sup.deliver_person like concat('%',#{deliverPerson},'%')</if>
+            <if test="deliverPersonPhone != null and deliverPersonPhone != ''"> or sup.deliver_person_phone like concat('%',#{deliverPersonPhone},'%')</if>
+            <if test="deliverAddress != null and deliverAddress != ''"> or sup.deliver_address like concat('%',#{deliverAddress},'%')</if>
+            <if test="receivePerson != null and receivePerson != ''"> or sup.receive_person like concat('%',#{receivePerson},'%')</if>
+            <if test="receivePersonPhone != null and receivePersonPhone != ''"> or sup.receive_person_phone like concat('%',#{receivePersonPhone},'%')</if>
+            <if test="receiveAddress != null and receiveAddress != ''"> or sup.receive_address like concat('%',#{receiveAddress},'%')</if>
+            <if test="invoiceCompanyName != null and invoiceCompanyName != ''"> and sup.invoice_company_name like concat('%', #{invoiceCompanyName}, '%')</if>
+            <if test="companyTaxNumber != null and companyTaxNumber != ''"> and sup.company_tax_number like concat('%', #{companyTaxNumber}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
             <if test="instanceId != null  and instanceId != ''"> and sup.instance_id = #{instanceId}</if>
             <if test="instanceType != null  and instanceType != ''"> and sup.instance_type = #{instanceType}</if>
             <if test="submitInstanceId != null  and submitInstanceId != ''"> and sup.submit_instance_id = #{submitInstanceId}</if>
@@ -122,7 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTitle != null  and applyTitle != ''"> and sup.apply_title = #{applyTitle}</if>
             <if test="applyUser != null  and applyUser != ''"> and sup.apply_user = #{applyUser}</if>
             <if test="applyTime != null "> and sup.apply_time = #{applyTime}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
                 and sup.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
             <if test="keyword != null and keyword != ''"> and ((sup.supplierCode like concat('%',#{keyword},'%') or sup.suppplierName like concat('%',#{keyword},'%'))</if>
@@ -137,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sup.legal_representative, sup.customer_contact, sup.contact_number, sup.customer_fax,
                sup.customer_email, sup.website, sup.payment_terms, sup.supplier_days, sup.actual_payment_days,
                sup.settlement_bank, sup.exchange_settlement_account, sup.deposit_bank, sup.bank_account,
+               sup.deliver_person, sup.deliver_person_phone, sup.deliver_address, sup.receive_person,
+               sup.receive_person_phone, sup.receive_address, sup.invoice_company_name, sup.company_tax_number,
                sup.rmb_registered_capital, sup.Industry_code, sup.merchandiser, sup.merchandiser_telephone,
                sup.financial_contact, sup.confirm_tax, sup.tax_rate, sup.first_add_time, sup.update_info_time,
                sup.create_by, sup.create_time, sup.update_by, sup.update_time, sup.remark,sup.del_flag,
@@ -209,6 +226,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exchangeSettlementAccount != null">exchange_settlement_account,</if>
             <if test="depositBank != null">deposit_bank,</if>
             <if test="bankAccount != null">bank_account,</if>
+            <if test="invoiceCompanyName != null">invoice_company_name,</if>
+            <if test="companyTaxNumber != null">company_tax_number,</if>
+            <if test="deliverPerson != null">deliver_person,</if>
+            <if test="deliverPersonPhone != null">deliver_person_phone,</if>
+            <if test="deliverAddress != null">deliver_address,</if>
+            <if test="receivePerson != null">receive_person,</if>
+            <if test="receivePersonPhone != null">receive_person_phone,</if>
+            <if test="receiveAddress != null">receive_address,</if>
             <if test="rmbRegisteredCapital != null">rmb_registered_capital,</if>
             <if test="industryCode != null">Industry_code,</if>
             <if test="merchandiser != null">merchandiser,</if>
@@ -258,6 +283,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exchangeSettlementAccount != null">#{exchangeSettlementAccount},</if>
             <if test="depositBank != null">#{depositBank},</if>
             <if test="bankAccount != null">#{bankAccount},</if>
+            <if test="invoiceCompanyName != null">#{invoiceCompanyName},</if>
+            <if test="companyTaxNumber != null">#{companyTaxNumber},</if>
+            <if test="deliverPerson != null">#{deliverPerson},</if>
+            <if test="deliverPersonPhone != null">#{deliverPersonPhone},</if>
+            <if test="deliverAddress != null">#{deliverAddress},</if>
+            <if test="receivePerson != null">#{receivePerson},</if>
+            <if test="receivePersonPhone != null">#{receivePersonPhone},</if>
+            <if test="receiveAddress != null">#{receiveAddress},</if>
             <if test="rmbRegisteredCapital != null">#{rmbRegisteredCapital},</if>
             <if test="industryCode != null">#{industryCode},</if>
             <if test="merchandiser != null">#{merchandiser},</if>
@@ -311,6 +344,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exchangeSettlementAccount != null">exchange_settlement_account = #{exchangeSettlementAccount},</if>
             <if test="depositBank != null">deposit_bank = #{depositBank},</if>
             <if test="bankAccount != null">bank_account = #{bankAccount},</if>
+            <if test="invoiceCompanyName != null">invoice_company_name = #{invoiceCompanyName},</if>
+            <if test="companyTaxNumber != null">company_tax_number = #{companyTaxNumber},</if>
+            <if test="deliverPerson != null">deliver_person = #{deliverPerson},</if>
+            <if test="deliverPersonPhone != null">deliver_person_phone = #{deliverPersonPhone},</if>
+            <if test="deliverAddress != null">deliver_address = #{deliverAddress},</if>
+            <if test="receivePerson != null">receive_person = #{receivePerson},</if>
+            <if test="receivePersonPhone != null">receive_person_phone = #{receivePersonPhone},</if>
+            <if test="receiveAddress != null">receive_address = #{receiveAddress},</if>
             <if test="rmbRegisteredCapital != null">rmb_registered_capital = #{rmbRegisteredCapital},</if>
             <if test="industryCode != null">Industry_code = #{industryCode},</if>
             <if test="merchandiser != null">merchandiser = #{merchandiser},</if>

ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html

@@ -207,6 +207,18 @@
                     <input name="bankAccount" disabled th:field="*{bankAccount}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">开票公司名称：</label>
+                <div class="col-sm-8">
+                    <input name="invoiceCompanyName" class="form-control" type="text" required disabled />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">开票公司税号：</label>
+                <div class="col-sm-8">
+                    <input name="companyTaxNumber" class="form-control" type="text" required disabled />
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">RMB注册资金：</label>
                 <div class="col-sm-8">
@@ -248,6 +260,42 @@
                            class="form-control" type="text" placeholder="%">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPerson" class="form-control" th:field="*{deliverPerson}" type="text" required disabled />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人电话：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPersonPhone" class="form-control" th:field="*{deliverPersonPhone}" type="text" disabled required />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人地址：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" disabled/>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货人：</label>
+                <div class="col-sm-8">
+                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required disabled />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货人电话：</label>
+                <div class="col-sm-8">
+                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required disabled />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货地址：</label>
+                <div class="col-sm-8">
+                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required disabled />
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">证件：</label>
                 <div class="col-sm-10">

ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html

@@ -207,6 +207,18 @@
                 <input name="bankAccount" disabled th:field="*{bankAccount}" class="form-control" type="text">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">开票公司名称：</label>
+            <div class="col-sm-8">
+                <input name="invoiceCompanyName" class="form-control" type="text" required disabled />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">开票公司税号：</label>
+            <div class="col-sm-8">
+                <input name="companyTaxNumber" class="form-control" type="text" required disabled />
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">RMB注册资金：</label>
             <div class="col-sm-8">
@@ -248,6 +260,42 @@
                        class="form-control" type="text" placeholder="%">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">发货人：</label>
+            <div class="col-sm-8">
+                <input name="deliverPerson" class="form-control" th:field="*{deliverPerson}" type="text" required disabled />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">发货人电话：</label>
+            <div class="col-sm-8">
+                <input name="deliverPersonPhone" class="form-control" th:field="*{deliverPersonPhone}" type="text" disabled required />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">发货人地址：</label>
+            <div class="col-sm-8">
+                <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" disabled/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">收货人：</label>
+            <div class="col-sm-8">
+                <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required disabled />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">收货人电话：</label>
+            <div class="col-sm-8">
+                <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required disabled />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">收货地址：</label>
+            <div class="col-sm-8">
+                <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required disabled />
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">证件：</label>
             <div class="col-sm-10">

ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html

@@ -180,6 +180,18 @@
                     <input name="bankAccount" th:field="*{bankAccount}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">开票公司名称：</label>
+                <div class="col-sm-8">
+                    <input name="invoiceCompanyName" class="form-control" type="text" required />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">开票公司税号：</label>
+                <div class="col-sm-8">
+                    <input name="companyTaxNumber" class="form-control" type="text" required />
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">RMB注册资金：</label>
                 <div class="col-sm-8">
@@ -219,6 +231,42 @@
                     <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text" placeholder="%">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPerson" class="form-control" th:field="*{deliverPerson}" type="text" required />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人电话：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPersonPhone" class="form-control" th:field="*{deliverPersonPhone}" type="text" required />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">发货人地址：</label>
+                <div class="col-sm-8">
+                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货人：</label>
+                <div class="col-sm-8">
+                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货人电话：</label>
+                <div class="col-sm-8">
+                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">收货地址：</label>
+                <div class="col-sm-8">
+                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">证件：</label>
                 <div class="col-sm-8">