Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java

@@ -369,6 +369,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
             QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
             yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh());
             yhdjQueryWrapper.eq("identity", companyservice.getIdentity());
+            yhdjQueryWrapper.eq("dlzh", yhdj.getDlzh());
             InvoiceAllYhdj yhdjTemp = yhdjMapper.selectOne(yhdjQueryWrapper);
             // 日志信息
             InvoiceAllApiLog invoiceAllApiLog = new InvoiceAllApiLog();

jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml

@@ -67,6 +67,9 @@
             <if test="sellername != null  and sellername != ''">and sellername like concat('%', #{sellername}, '%')</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="rebackType != null  and rebackType != ''">and reback_type = #{rebackType}</if>
+            <if test="companyid != null and companyid !=''">
+                and companyid = #{companyid}
+            </if>
         </where>
     </select>
 

jianshui-ui/src/views/system/companyservice/index.vue

@@ -3,6 +3,10 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-col>
+          <el-form-item label="企业id" prop="companyid">
+            <el-input v-model="queryParams.companyid" placeholder="请输入企业id" clearable size="small"
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
           <el-form-item label="企业税号" prop="sellertax">
             <el-input v-model="queryParams.sellertax" placeholder="请输入企业税号" clearable size="small"
                       @keyup.enter.native="handleQuery"/>
@@ -205,6 +209,7 @@ export default {
         checker: null,
         payer: null,
         rebackType: null,
+        companyid: null,
       },
       // 表单参数
       form: {},