diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 97367a6e..2ae52c90 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -7,6 +7,9 @@ import java.util.Objects; import javax.annotation.Resource; +import com.dxhy.auth.client.annotation.IgnoreClientToken; +import com.dxhy.auth.client.annotation.IgnoreUserToken; +import com.dxhy.extend.entity.PullRecordReq; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -240,4 +243,21 @@ public class ExtInvoicePoolController extends AbstractController { return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); } } + /** + * 拉取记录列表获取 + */ + @IgnoreClientToken + @IgnoreUserToken + @RequestMapping("getPullRecordList") + public ResponseEntity getPullRecordList(@RequestBody PullRecordReq pullRecordReq){ + try{ + return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); + }catch (Exception e){ + e.printStackTrace(); + log.error("",e); + return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); + + } + + } } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/dao/ExtInvoicePoolDao.java b/dxhy-extend/src/main/java/com/dxhy/extend/dao/ExtInvoicePoolDao.java index 7edda046..b98e92cc 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/dao/ExtInvoicePoolDao.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/dao/ExtInvoicePoolDao.java @@ -3,12 +3,10 @@ package com.dxhy.extend.dao; import java.util.List; import java.util.Map; +import com.dxhy.extend.entity.*; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dxhy.extend.entity.AmortizeRecordEntity; -import com.dxhy.extend.entity.ExtAddTaxInvoice; -import com.dxhy.extend.entity.ExtOtherInvoice; /** * @author dxhy @@ -80,4 +78,6 @@ public interface ExtInvoicePoolDao extends BaseMapper { List listAmortizeRecord(Map pramsMap); List listIncentiveFlag(); + + List getPullRecord(PullRecordReq pullRecordReq); } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordModel.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordModel.java new file mode 100644 index 00000000..45664035 --- /dev/null +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordModel.java @@ -0,0 +1,68 @@ +package com.dxhy.extend.entity; + +import lombok.Data; + +/** + * @Author wangzhikun + * @Date 2023/4/15 2023/4/15 + */ +@Data +public class PullRecordModel { + + //公司名称 + private String companyName; + //会计凭证号码 + private String belnr; + //会计年度 + private String gjahr; + //账期 + private String monat; + //过账日期 + private String budat; + //报账单号 + private String zbzdh; + + //结算单 + private String zjsdh; + //报账单状态 + private String zbzdzt; + //借贷标识 + private String zdrcrk; + //科目编码 + private String racct; + //科目描述 + private String txt50; + //供应商名称 + private String zname; + //供应商编码 + private String lifnr; + //客户编码 + private String kunnr; + //客户名称 + private String zname2; + //物料编码 + private String matnr; + //数量 + private String msl; + //单位 + private String runit; + //税码 + private String mwskz; + //税率 + private String kbetr; + //本位币借方金额 + private String zhslj; + //本位币贷方金额 + private String zhsld; + //销售订单 + private String kdauf; + //销售订单行 + private String kdpos; + //矿别编号 + private String kbbh; + //矿别 + private String ktype; + //最后接收时间 + private String lastReceiveTime; + +} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java new file mode 100644 index 00000000..75ffa921 --- /dev/null +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/PullRecordReq.java @@ -0,0 +1,32 @@ +package com.dxhy.extend.entity; + +import lombok.Data; + +/** + * @Author wangzhikun + * @Date 2023/4/14 2023/4/14 + */ +@Data +public class PullRecordReq { + //公司名称 + private String companyName; + //账期 + private String accountPeriod; + //税码 + private String sm; + //科目编码 + private String kmbm; + //科目描述 + private String kmms; + //供应商名称 + private String supplierName; + //客户名称 + private String customerName; + //过账起始日期 + private String accountStartDate; + //过账终止日期 + private String accountEndDate; + + private int curr; + private int size; +} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolService.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolService.java index aa3cc9b2..8365106e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolService.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolService.java @@ -4,6 +4,7 @@ import java.util.Map; import com.dxhy.common.service.MpBaseService; import com.dxhy.extend.entity.ExtAddTaxInvoice; +import com.dxhy.extend.entity.PullRecordReq; /** * @author dxhy @@ -59,4 +60,6 @@ public interface ExtInvoicePoolService extends MpBaseService { Object amortizeRecord(Map pramsMap); Object incentiveFlagList(String dbName); + + Object selectPullRecord(PullRecordReq pullRecordReq); } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index cd42dae9..bbd9878e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.extend.service.pool; import java.util.List; import java.util.Map; +import com.dxhy.extend.entity.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -14,9 +15,6 @@ import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.common.util.AmountFormatUtil; import com.dxhy.common.util.MathUtil; import com.dxhy.extend.dao.ExtInvoicePoolDao; -import com.dxhy.extend.entity.AmortizeRecordEntity; -import com.dxhy.extend.entity.ExtAddTaxInvoice; -import com.dxhy.extend.entity.ExtOtherInvoice; import com.dxhy.extend.util.InvoiceTypeUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -406,6 +404,32 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl recordList=super.baseMapper.getPullRecord(pullRecordReq); + PageInfo pageInfo = new PageInfo<>(recordList); + json.put("total",pageInfo.getTotal()); + json.put("dataList",pageInfo.getList()); + + }catch (Exception e){ + e.printStackTrace(); + json = super.errorResult(e); + } + return super.responseResult(json); + } /** * 摊销记录 @@ -452,4 +476,5 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl + +