修改导出字段和查询条件

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -770,6 +770,138 @@ public class BaseInvoiceController extends AbstractController {
 
     }
 
+
+    /**
+     * 智能勾选查询 qsfs 默认传9
+     *
+     * @return 返回结果
+     */
+    @PostMapping("/sggx/sgrzzngxcx")
+    @SysLog("调用智能勾选查询接口")
+    @ResponseBody
+    public Object sgrzzngxcx(@RequestBody Map<String, Object> map) {
+        String gfsh = (String)map.get("gfsh");
+        String invoiceType = (String)map.get("invoiceType");
+        String invoiceSource = (String)map.get("invoiceSource");
+        String kpksrq = (String)map.get("kpksrq");
+        String kpjsrq = (String)map.get("kpjsrq");
+        String qszt = (String)map.get("qszt");
+        String qsfs = (String)map.get("qsfs");
+        String businessCode = (String)map.get("businessCode");
+        String qsksrq = (String)map.get("qsksrq");
+        String qsjsrq = (String)map.get("qsjsrq");
+        String xfmc = (String)map.get("xfmc");
+        String maxTax = (String)map.get("maxTax");
+        String floatTax = (String)map.get("floatTax");
+        String yxsxfs = (String)map.get("yxsxfs");
+        String qsr = (String)map.get("qsr");
+        String invoiceNo = (String)map.get("invoiceNo");
+        Map<String, Object> pramsMap = new HashMap<>(18);
+
+        pramsMap.put("business", getUserInfo().getBusiness());
+        pramsMap.put("dbName", getUserInfo().getDbName());
+        List<Tax> taxList = getUserInfo().getOrg();
+        pramsMap.put("taxList", taxList);
+        pramsMap.put("qsflag", getUserInfo().getQsStatus());
+        if (StringUtils.isNotBlank(maxTax)) {
+            pramsMap.put("maxTax", maxTax);
+        } else {
+            return ResponseEntity.ok(R.error("税额上限不能为空！"));
+        }
+        if (StringUtils.isNotBlank(floatTax)) {
+            pramsMap.put("floatTax", floatTax);
+        } else {
+            return ResponseEntity.ok(R.error("税额容差不能为空！"));
+        }
+        if (StringUtils.isNotBlank(yxsxfs)) {
+            pramsMap.put("yxsxfs", yxsxfs);
+        } else {
+            return ResponseEntity.ok(R.error("优先筛选方式不能为空！"));
+        }
+        if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
+            pramsMap.put("gfsh", gfsh);
+        } else {
+            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+        }
+        if (invoiceSource != null) {
+            if (!"99".equals(invoiceSource)) {
+                pramsMap.put("invoiceSource", invoiceSource);
+            }
+        }
+        if (!StringUtils.isBlank(invoiceType)) {
+            if (!"99".equals(invoiceType)) {
+                pramsMap.put("invoiceType", invoiceType);
+            }
+        } else {
+            return ResponseEntity.ok(R.error("发票类型不能为空！"));
+        }
+        pramsMap.put("businessCode", "99");
+        if (!StringUtils.isBlank(qszt)) {
+            if (!"99".equals(qszt)) {
+                pramsMap.put("qszt", qszt);
+                if ("1".equals(qszt)) {
+                    if (!StringUtils.isBlank(qsksrq)) {
+                        pramsMap.put("qsksrq", qsksrq);
+                    } else {
+                        return ResponseEntity.ok(R.error("签收开始日期不能为空！"));
+                    }
+                    if (!StringUtils.isBlank(qsjsrq)) {
+                        pramsMap.put("qsjsrq", qsjsrq);
+                    } else {
+                        return ResponseEntity.ok(R.error("签收结束日期不能为空！"));
+                    }
+                    if (!StringUtils.isBlank(qsr)) {
+                        pramsMap.put("qsr", qsr);
+                    }
+                    if (!StringUtils.isBlank(qsfs)) {
+                        // 表示全部
+                        if (!"99".equals(qsfs)) {
+                            pramsMap.put("qsfs", qsfs);
+                        }
+                    } else {
+                        return ResponseEntity.ok(R.error("签收方式不能为空！"));
+                    }
+                    pramsMap.put("businessCode", businessCode);
+                }
+            }
+        } else {
+            return ResponseEntity.ok(R.error("签收状态不能为空！"));
+        }
+        String qsflag = getUserInfo().getQsStatus();
+        if ("1".equals(qsflag)) {
+            pramsMap.put("qszt", "1");
+        }
+        if (!StringUtils.isBlank(kpksrq)) {
+            pramsMap.put("kpksrq", kpksrq);
+        } else {
+            return ResponseEntity.ok(R.error("开票开始日期不能为空！"));
+        }
+        if (!StringUtils.isBlank(kpjsrq)) {
+            pramsMap.put("kpjsrq", kpjsrq);
+        } else {
+            return ResponseEntity.ok(R.error("开票结束日期不能为空！"));
+        }
+
+        if (!StringUtils.isBlank(xfmc)) {
+            pramsMap.put("xfmc", xfmc);
+        }
+        if (!StringUtils.isBlank(invoiceNo)) {
+            if(invoiceNo.length()==8){
+                pramsMap.put("invoiceNo", invoiceNo);
+            }else {
+                pramsMap.put("eleInvoiceNo", invoiceNo);
+            }
+        }
+        try {
+            return ResponseEntity.ok(R.ok().put("data", baseIntelligentizeCheckService.beforezngx(pramsMap)));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("", e);
+            return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT));
+        }
+
+    }
+
     /**
      * 智能勾选入库 qsfs 默认传9
      *

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -797,8 +797,7 @@
         <if test="qszt!=null and qszt != ''">
             and t.qs_status = #{qszt}
         </if>
-        <if
-                test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
+        <if test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
             and t.dept_id = #{businessCode}
         </if>
         <if test="businessCode==''">

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

@@ -35,7 +35,9 @@
         <result column="in_account_status" property="inAccountStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
-
+        <result column="bzdh" property="bzdh"/>
+        <result column="inAccountStatus" property="inAccountStatus"/>
+        <result column="compCode" property="compCode"/>
     </resultMap>
 
     <resultMap id="RzcxhjResultMap"
@@ -81,7 +83,7 @@
         select
         t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no
         gfsh,t.gf_name
-        gfmc,t.dept_id deptId,t.dept_name deptName,
+        gfmc,t.dept_id deptId,t.dept_name deptName,t.bzdh,t.inaccount_status inAccountStatus,t.comp_code compCode
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,
         date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date, '%Y-%m-%d')
         qs_date,t.rzh_type,