修改mapper文件

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

@@ -16,6 +16,7 @@ import com.dxhy.common.util.UserInfoUtil;
 import com.dxhy.common.utils.DateUtils;
 import com.dxhy.common.utils.R;
 import com.dxhy.common.vo.Tax;
+import com.dxhy.common.vo.TaxOrgCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.ResponseEntity;
@@ -426,6 +427,16 @@ public class BaseInvoiceController extends AbstractController {
     @SysLog("调用手工勾选查询接口")
     @ResponseBody
     public Object sggxcx(@RequestBody Map<String, Object> map) {
+//        List<TaxOrgCode> orgCodes = getUserInfo().getOrgCodes();
+//        log.info("user信息========>{}",getUserInfo());
+//        if (orgCodes != null && orgCodes.size() > 0){
+//            for (int i = 0; i < orgCodes.size(); i++) {
+//                log.info("orgcode=======>{}",orgCodes.get(i));
+//            }
+//        }else {
+//            log.info("未能获得机构代码");
+//        }
+
         String gfsh = (String)map.get("gfsh");
         String invoiceType = (String)map.get("invoiceType");
         String invoiceSource = (String)map.get("invoiceSource");
@@ -448,8 +459,22 @@ public class BaseInvoiceController extends AbstractController {
         String menuId = (String)map.get("menuId");
         String bzdh = (String) map.get("bzdh");
         String inAccountStatus = (String) map.get("inAccountStatus");
+//        //所属机构列表
+//        List<String> orgCodes = null;
+//        if (map.get("orgCodes") !=null){
+//            orgCodes = (List<String>) map.get("orgCodes");
+//        }else {
+//            List<TaxOrgCode> taxOrgCodes  = getUserInfo().getOrgCodes();
+//            if (taxOrgCodes != null && taxOrgCodes.size() > 0){
+//                for (TaxOrgCode taxOrgCode : taxOrgCodes) {
+//                    orgCodes.add(taxOrgCode.getOrgCode());
+//                }
+//            }
+//        }
 
-        Map<String, Object> pramsMap = new HashMap<>(18);
+
+        Map<String, Object> pramsMap = new HashMap<>(32);
+//        pramsMap.put("orgCodes",orgCodes);
         pramsMap.put("bzdh", bzdh);
         pramsMap.put("inAccountStatus", inAccountStatus);
         pramsMap.put("company", company);

dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

@@ -67,6 +67,18 @@
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if
                 test="yczt != null and yczt != '' and yczt != 'null' ">
             and t.invoice_status = #{yczt}
@@ -174,6 +186,18 @@
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
+        </if>
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
         <if
                 test="yczt != null and yczt != '' and yczt != 'null' ">
             and t.invoice_status = #{yczt}