Merge remote-tracking branch 'origin/release' into release

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<R> 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));
+
+        }
+
+    }
 }

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<ExtAddTaxInvoice> {
     List<AmortizeRecordEntity> listAmortizeRecord(Map<String, Object> pramsMap);
 
     List<String> listIncentiveFlag();
+
+    List<PullRecordModel> getPullRecord(PullRecordReq pullRecordReq);
 }

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;
+
+}

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;
+}

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<ExtAddTaxInvoice> {
     Object amortizeRecord(Map<String, Object> pramsMap);
 
     Object incentiveFlagList(String dbName);
+
+    Object selectPullRecord(PullRecordReq pullRecordReq);
 }

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<ExtInvoicePoolD
         }
         return super.responseResult(json);
     }
+    @Override
+    public Object selectPullRecord(PullRecordReq pullRecordReq) {
+        JSONObject json = new JSONObject();
+        try{
+            String[] titlelist = {"公司名称", "会计凭证号码", "会计年度",
+                    "账期", "过账日期","报账单号","结算单","报账单状态","借贷标识","科目编码"
+                    ,"科目描述","供应商名称","供应商编码","客户编码","客户名称","物料编码","数量","单位",
+                    "税码","税率","本位币借方金额","本位币贷方金额","销售订单","销售订单行","矿别编号","矿别","最后接收时间"};
+            String[] titleProp = {"companyName","belnr","gjahr",
+                    "monat","budat","zbzdh","zjsdh","zbzdzt","zdrcrk","racct",
+                    "txt50","zname","lifnr","kunnr","zname2","matnr","msl","runit",
+                    "mwskz","kbetr","zhslj","zhsld","kdauf","kdpos","kbbh","ktype","lastReceiveTime"};
+            json = super.setTitleList(titlelist, titleProp);
+            DynamicContextHolder.push("business_business_read");
+            PageHelper.startPage(pullRecordReq.getCurr(),pullRecordReq.getSize());
+            List<PullRecordModel> recordList=super.baseMapper.getPullRecord(pullRecordReq);
+            PageInfo<PullRecordModel> 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<ExtInvoicePoolD
         json.put("incentiveFlagList", incentiveFlagList);
         return super.responseResult(json);
     }
+
 }

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

@@ -506,6 +506,50 @@
           AND status = '0'
         ORDER BY create_date DESC
     </select>
+    <!--
+     String[] titlelist = {"公司名称", "会计凭证号码", "会计年度",
+                    "账期", "过账日期","报账单号","结算单","报账单状态","借贷标识","科目编码"
+                    ,"科目描述","供应商名称","供应商编码","客户编码","客户名称","物料编码","数量","单位",
+                    "税码","税率","本位币借方金额","本位币贷方金额","销售订单","销售订单行","矿别编号","矿别","最后接收时间"};
+            String[] titleProp = {"companyName","belnr","gjahr",
+                    "monat","budat","zbzdh","zjsdh","zbzdzt","zdrcrk","racct",
+                    "txt50","zname","lifnr","kunnr","zname2","matnr","msl","runit",
+                    "mwskz","kbetr","zhslj","zhsld","kdauf","kdpos","kbbh","ktype","lastReceiveTime"}
+                    -->
+    <select id="getPullRecord" parameterType="com.dxhy.extend.entity.PullRecordReq"
+            resultType="com.dxhy.extend.entity.PullRecordModel">
+        select vr.butxt companyName,vr.belnr, vr.gjahr,
+        vr.monat,vr.budat,vr.zbzdh,vr.zjsdh,vr.zbzdzt,vri.zdrcrk,vri.racct,
+        vri.txt50,vri.zname,vri.lifnr,vri.kunnr,vri.zname2,vri.matnr,vri.msl,vri.runit,
+        vri.mwskz,vri.kbetr,vri.zhslj,vri.zhsld,vri.kdauf,vri.kdpos,vri.ktype,vr.create_time lastReceiveTime
+        from
+        voucher_record_item vri LEFT JOIN voucher_record vr on vri.relation_id = vr.id
+         where 1=1
+        <if test="companyName!=null and companyName != ''">
+            and vr.butxt = #{companyName}
+        </if>
+        <if test ="accountPeriod !=null and accountPeriod !=''">
+            and CONCAT_WS("-",vr.gjahr,vr.monat) = #{accountPeriod}
+        </if>
+        <if test="sm != null and sm !=''">
+            and vri.mwskz = #{sm}
+        </if>
+        <if test="kmbm != null and kmbm !=''">
+            and vri.racct = #{kmbm}
+        </if>
+        <if test="kmms !=null and kmms !=''" >
+            and vri.txt50 = #{kmms}
+        </if>
+        <if test="supplierName !=null and supplierName !=''">
+            and vri.zname1 = #{supplierName}
+        </if>
+        <if test="customerName!=null and customerName !=''">
+            and vri.zname2 = #{customerName}
+        </if>
+        <if test = "accountStartDate !=null and accountStartDate!=''">
+            and date_format(vr.budat,'%Y-%m-%d') between #{accountStartDate} and #{accountEndDate}
+        </if>
+    </select>
 
     <!--销项票池优惠政策查询-->
     <select id="listIncentiveFlag" resultType="java.lang.String">