diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 5551f9e4..31d94019 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/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 map) { +// List 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 orgCodes = null; +// if (map.get("orgCodes") !=null){ +// orgCodes = (List) map.get("orgCodes"); +// }else { +// List taxOrgCodes = getUserInfo().getOrgCodes(); +// if (taxOrgCodes != null && taxOrgCodes.size() > 0){ +// for (TaxOrgCode taxOrgCode : taxOrgCodes) { +// orgCodes.add(taxOrgCode.getOrgCode()); +// } +// } +// } - Map pramsMap = new HashMap<>(18); + + Map pramsMap = new HashMap<>(32); +// pramsMap.put("orgCodes",orgCodes); pramsMap.put("bzdh", bzdh); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 23702c52..163b54be 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -67,6 +67,18 @@ and t.inaccount_status = #{inAccountStatus} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + + + and t.image_id = #{imageNumber} + + + and t.account_period = #{accountPeriod} + and t.invoice_status = #{yczt} @@ -174,6 +186,18 @@ and t.inaccount_status = #{inAccountStatus} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + + + and t.image_id = #{imageNumber} + + + and t.account_period = #{accountPeriod} + and t.invoice_status = #{yczt}