ariesy 签收查询导出

dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java

@@ -187,7 +187,9 @@ public class ExcelController extends AbstractController {
         if (StringUtils.isNotBlank(condition)) {
             JSONObject prams = JSONObject.parseObject(condition);
             String gfsh = prams.getString("gfsh");
+            String companyCode = prams.getString("companyCode");
             prams.put("business", getUserInfo().getBusiness());
+            prams.put("companyCode", companyCode);
             // 非查验综合查询、查验明细导出处理
             if (!"30".equals(serviceType) && !"29".equals(serviceType)) {
 

dxhy-core/src/main/resources/mapper/QsxxMapper.xml

@@ -39,6 +39,9 @@
         <if test="gfsh != null and gfsh != '' and gfsh != 'null' and gfshFlag != '99' ">
             and t.gf_tax_no = #{gfsh}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
+        </if>
         <if test="voucherNumber != null and voucherNumber != ''">
             and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
         </if>