后端代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -181,6 +181,7 @@ public class NoCarController {
     @LoginRequired
     public RespR findNocarCalculateInfo(Page page, NoCarCalculateInfor carCalculateInfor) {
         try {
+            setTimeDue1(carCalculateInfor);
             RespR respR = new RespR(noCarCalculateInfoService.findByPageAndCalculateInfor(page, carCalculateInfor));
             return respR;
         }catch (Exception e){
@@ -188,4 +189,21 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
+
+    public void setTimeDue1(NoCarCalculateInfor carCalculateInfor){
+        if(!StringUtils.isEmpty(carCalculateInfor.getInvoiceMakeTime()) && !"null".equals(carCalculateInfor.getInvoiceMakeTime())){
+            String [] res = carCalculateInfor.getInvoiceMakeTime().split(",");
+            carCalculateInfor.setInvoiceMakeStart(res[0]);
+            carCalculateInfor.setInvoiceMakeEnd(res[1]);
+        }else{
+            carCalculateInfor.setInvoiceMakeTime(null);
+        }
+        if(!StringUtils.isEmpty(carCalculateInfor.getCalculateTime()) && !"null".equals(carCalculateInfor.getCalculateTime())){
+            String [] res = carCalculateInfor.getCalculateTime().split(",");
+            carCalculateInfor.setCalculateStart(res[0]);
+            carCalculateInfor.setCalculateEnd(res[1]);
+        }else{
+            carCalculateInfor.setCalculateTime(null);
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -14,6 +14,7 @@ import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -59,6 +60,7 @@ public class SelfCarController {
     @LoginRequired
     public RespR findTrades(Page page, SelfCarTrade selfCarTrade) {
         try {
+            setTimeDue(selfCarTrade);
             RespR respR = new RespR(selfCarTradeService.findByPageAndTrade(page, selfCarTrade));
             return respR;
         }catch (Exception e){
@@ -66,7 +68,22 @@ public class SelfCarController {
             return new RespR(false,e.getMessage());
         }
     }
-
+    public void setTimeDue(SelfCarTrade selfCarTrade){
+        if(!StringUtils.isEmpty(selfCarTrade.getAclTimeBegin()) && !"null".equals(selfCarTrade.getAclTimeBegin())){
+            String [] res = selfCarTrade.getAclTimeBegin().split(",");
+            selfCarTrade.setAclTimeBegin(res[0]);
+            selfCarTrade.setAclTimeEnd(res[1]);
+        }else{
+            selfCarTrade.setAclTimeBegin(null);
+        }
+        if(!StringUtils.isEmpty(selfCarTrade.getExTimeBegin()) && !"null".equals(selfCarTrade.getExTimeBegin())){
+            String [] res = selfCarTrade.getExTimeBegin().split(",");
+            selfCarTrade.setExTimeBegin(res[0]);
+            selfCarTrade.setExTimeEnd(res[1]);
+        }else{
+            selfCarTrade.setExTimeBegin(null);
+        }
+    }
     /**
      * 分页查询所有发票信息
      *
@@ -78,6 +95,11 @@ public class SelfCarController {
     @LoginRequired
     public RespR findSelfCarInvoices(Page page, SelfCarInvoice selfCarInvoice) {
         try {
+            if(!StringUtils.isEmpty(selfCarInvoice.getInvoiceMakeTime()) && !"null".equals(selfCarInvoice.getInvoiceMakeTime())){
+                String [] res =selfCarInvoice.getInvoiceMakeTime().split(",");
+                selfCarInvoice.setInvoiceMakeStart(res[0]);
+                selfCarInvoice.setInvoiceMakeEnd(res[1]);
+            }
             RespR respR = new RespR(selfCarInvoiceService.findByPageAndInvoice(page, selfCarInvoice));
             return respR;
         }catch (Exception e){

src/main/java/com/jkcredit/invoice/controller/service/NoCarServiceController.java

@@ -82,7 +82,7 @@ public class NoCarServiceController {
      * @return
      */
     @PostMapping("/hCVoiceQuery")
-    @ApiOperation(value="红冲发票查询接口", notes="红冲发票查询接口（走本地库）")
+    @ApiOperation(value="红冲发票查询接口", notes="红冲发票查询接口")
     //@LoginRequired
     public RespR hCVoiceQuery(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo){
         return noCarService.hCInvoiceQuery(hcInvoiceQueryVo);

src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -24,6 +24,23 @@ public class NoCarCalculateInfor {
     private String companyNum;
 
     /**
+     * 购方名称
+     */
+    private String buyerName;
+
+    /**
+     * 购方税号
+     */
+    private String buyerTaxpayerCode;
+
+    /**
+     *开票时间
+     */
+    private String invoiceMakeTime;
+    private String invoiceMakeStart;
+    private String invoiceMakeEnd;
+
+    /**
      * 计费费用
      */
     private Long fee;
@@ -31,7 +48,8 @@ public class NoCarCalculateInfor {
      * 计费时间
      */
     private String calculateTime;
-
+    private String calculateStart;
+    private String calculateEnd;
     /**
      * 类型 1-无车 2-自有车 3-外协车
      */
@@ -92,4 +110,60 @@ public class NoCarCalculateInfor {
     public void setCompanyNum(String companyNum) {
         this.companyNum = companyNum;
     }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getBuyerTaxpayerCode() {
+        return buyerTaxpayerCode;
+    }
+
+    public void setBuyerTaxpayerCode(String buyerTaxpayerCode) {
+        this.buyerTaxpayerCode = buyerTaxpayerCode;
+    }
+
+    public String getInvoiceMakeTime() {
+        return invoiceMakeTime;
+    }
+
+    public void setInvoiceMakeTime(String invoiceMakeTime) {
+        this.invoiceMakeTime = invoiceMakeTime;
+    }
+
+    public String getInvoiceMakeStart() {
+        return invoiceMakeStart;
+    }
+
+    public void setInvoiceMakeStart(String invoiceMakeStart) {
+        this.invoiceMakeStart = invoiceMakeStart;
+    }
+
+    public String getInvoiceMakeEnd() {
+        return invoiceMakeEnd;
+    }
+
+    public void setInvoiceMakeEnd(String invoiceMakeEnd) {
+        this.invoiceMakeEnd = invoiceMakeEnd;
+    }
+
+    public String getCalculateStart() {
+        return calculateStart;
+    }
+
+    public void setCalculateStart(String calculateStart) {
+        this.calculateStart = calculateStart;
+    }
+
+    public String getCalculateEnd() {
+        return calculateEnd;
+    }
+
+    public void setCalculateEnd(String calculateEnd) {
+        this.calculateEnd = calculateEnd;
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java

@@ -28,6 +28,11 @@ public class SelfCarCalculateInfor {
      */
     private String calTime;
 
+    /**
+     * 开票时间
+     */
+    private String invoiceMkTime;
+
 
     public Long getId() {
         return id;
@@ -76,4 +81,12 @@ public class SelfCarCalculateInfor {
     public void setCalTime(String calTime) {
         this.calTime = calTime;
     }
+
+    public String getInvoiceMkTime() {
+        return invoiceMkTime;
+    }
+
+    public void setInvoiceMkTime(String invoiceMkTime) {
+        this.invoiceMkTime = invoiceMkTime;
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/invoice/SelfCarInvoice.java

@@ -5,6 +5,21 @@ package com.jkcredit.invoice.model.entity.invoice;
  */
 public class SelfCarInvoice {
     private Long id;
+
+    /**
+     * 公司编码
+     */
+    private String companyNum;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
     /**
      * etc卡号
      */
@@ -21,6 +36,10 @@ public class SelfCarInvoice {
      *开票时间
      */
     private String invoiceMakeTime;
+
+    private String invoiceMakeStart;
+
+    private String invoiceMakeEnd;
     /**
      *发票url
      */
@@ -279,4 +298,44 @@ public class SelfCarInvoice {
     public void setBuyerTaxpayerCode(String buyerTaxpayerCode) {
         this.buyerTaxpayerCode = buyerTaxpayerCode;
     }
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getInvoiceMakeStart() {
+        return invoiceMakeStart;
+    }
+
+    public void setInvoiceMakeStart(String invoiceMakeStart) {
+        this.invoiceMakeStart = invoiceMakeStart;
+    }
+
+    public String getInvoiceMakeEnd() {
+        return invoiceMakeEnd;
+    }
+
+    public void setInvoiceMakeEnd(String invoiceMakeEnd) {
+        this.invoiceMakeEnd = invoiceMakeEnd;
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/waybill/SelfCarTrade.java

@@ -59,6 +59,21 @@ public class SelfCarTrade {
      */
     private String aclTime;
 
+    /********下边字段用于查询*********/
+    private String exTimeBegin;
+
+    private String exTimeEnd;
+
+    private String aclTimeBegin;
+
+    private String aclTimeEnd;
+
+    /**
+     * 会否是异常发票 1 -是 2-否
+     */
+    private String exceptionFlag;
+
+
     public Long getId() {
         return id;
     }
@@ -154,4 +169,44 @@ public class SelfCarTrade {
     public void setCompanyReferencenum(String companyReferencenum) {
         this.companyReferencenum = companyReferencenum;
     }
+
+    public String getExTimeBegin() {
+        return exTimeBegin;
+    }
+
+    public void setExTimeBegin(String exTimeBegin) {
+        this.exTimeBegin = exTimeBegin;
+    }
+
+    public String getExTimeEnd() {
+        return exTimeEnd;
+    }
+
+    public void setExTimeEnd(String exTimeEnd) {
+        this.exTimeEnd = exTimeEnd;
+    }
+
+    public String getAclTimeBegin() {
+        return aclTimeBegin;
+    }
+
+    public void setAclTimeBegin(String aclTimeBegin) {
+        this.aclTimeBegin = aclTimeBegin;
+    }
+
+    public String getAclTimeEnd() {
+        return aclTimeEnd;
+    }
+
+    public void setAclTimeEnd(String aclTimeEnd) {
+        this.aclTimeEnd = aclTimeEnd;
+    }
+
+    public String getExceptionFlag() {
+        return exceptionFlag;
+    }
+
+    public void setExceptionFlag(String exceptionFlag) {
+        this.exceptionFlag = exceptionFlag;
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -375,6 +375,9 @@ public class NoCarServiceImpl implements NoCarService{
                     calculateInfor.setCompanyNum(noCarWayBillDb.getCompanyNum());
                     calculateInfor.setCtype(1);
                     calculateInfor.setCustomId(noCarWayBill.getCustomerName());
+                    calculateInfor.setBuyerName(invoiceProcessingListModel.getBuyerName());
+                    calculateInfor.setBuyerTaxpayerCode(invoiceProcessingListModel.getBuyerTaxpayerCode());
+                    calculateInfor.setInvoiceMakeTime(invoiceProcessingListModel.getInvoiceMakeTime());
                     /**
                      * 这个设置为动态的 TODO
                      */
@@ -382,6 +385,7 @@ public class NoCarServiceImpl implements NoCarService{
                     calculateInfor.setTradeId(billInvoice.getTransactionId());
                     //先查询数据库中有没有这个交易id
                     if(calculateInforMapper.selectByTradeId(billInvoice.getTransactionId())==null){
+                        //todo 扣除客户费用
                         calculateInforMapper.insert(calculateInfor);
                     }
 

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -52,7 +52,6 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     @Autowired
     SelfCarCalculateInforMapper calculateInforMapper;
     @Override
-    @Transactional
     public RespR<List<CardTradeModel>> getTradeList(TradeRequestVo tradeRequestVo) {
         Customer customer = customerMapper.selectByCustomerName(tradeRequestVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
@@ -103,17 +102,6 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                         selfCarTrade.setFee(cardTradeModel.getFee());
                         selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
                         sellCarTradeMapper.insert(selfCarTrade);
-                        //计费
-                        SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
-                        carCalculateInfor.setCustomId(customerRec.getCustomerName());
-                        carCalculateInfor.setCompanyNum(customerRec.getCompanyName());
-                        carCalculateInfor.setCalTime(StringUtils.substring(cardTradeModel.getExTime(),0,7));
-                        carCalculateInfor.setFee(customer.getFee());
-                        carCalculateInfor.setEtcNum(cardTradeModel.getCardId());
-                        if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
-                            calculateInforMapper.insert(carCalculateInfor);
-                        }
-
                     }else{
                         if(selfCarTrade.getStatus()!=tradeRequestVo.getTradeStatus()){
                             selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
@@ -188,8 +176,10 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
 
     @Override
+    @Transactional
     public RespR<List<SelfCarInvoice>> getSelfCarInvoicesByApplyIds(ApplQueryInvVo applQueryInvVo) {
         B2BInvoiceQueryByApplyRequest b2BInvoiceQueryRequest = new B2BInvoiceQueryByApplyRequest();
+        Customer customer = customerMapper.selectByCustomerName(applQueryInvVo.getCustomerName());
         CustomerRec customerRec = new CustomerRec();
         customerRec.setCustomerName(applQueryInvVo.getCustomerName());
         customerRec.setCompanyName(applQueryInvVo.getCompanyName());
@@ -209,11 +199,27 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             for(B2BInvoiceQueryByApplyModel b2BInvoiceQueryByApplyModel:b2BInvoiceQueryByApplyModels){
                 SelfCarInvoice selfCarInvoice = new SelfCarInvoice();
                 BeanUtils.copyProperties(b2BInvoiceQueryByApplyModel,selfCarInvoice);
+                selfCarInvoice.setCompanyName(customerRec.getCompanyName());
+                selfCarInvoice.setCompanyNum(customerRec.getCompanyNum());
+                selfCarInvoice.setCustomerName(customerRec.getCustomerName());
+                selfCarInvoice.setBuyerTaxpayerCode(customerRec.getCompanyReferencenum());
+                selfCarInvoice.setExStation(b2BInvoiceQueryByApplyModel.getExStationName());
+                selfCarInvoice.setEnStation(b2BInvoiceQueryByApplyModel.getEnStationName());
                 selfCarInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(selfCarInvoice.getInvoiceMakeTime()));
                 selfCarInvoice.setExTime(DateUtil.tTimeToDate(selfCarInvoice.getExTime()));
                 if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                     selfCarInvoiceMapper.insert(selfCarInvoice);
                 }
+                //计费
+                SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
+                carCalculateInfor.setCustomId(customerRec.getCustomerName());
+                carCalculateInfor.setCompanyNum(customerRec.getCompanyName());
+                carCalculateInfor.setCalTime(StringUtils.substring(b2BInvoiceQueryByApplyModel.getExTime(),0,7));
+                carCalculateInfor.setFee(customer.getFee());
+                carCalculateInfor.setEtcNum(b2BInvoiceQueryByApplyModel.getCardId());
+                if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
+                    calculateInforMapper.insert(carCalculateInfor);
+                }
             }
             //返回相应的发票
             return new RespR(b2BInvoiceQueryByApplyModels);
@@ -259,6 +265,18 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                         selfCarInvoiceMapper.insert(selfCarInvoice);
                     }
+
+                    //计费
+                    SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
+                    carCalculateInfor.setCustomId(customerRec.getCustomerName());
+                    carCalculateInfor.setCompanyNum(customerRec.getCompanyName());
+                    carCalculateInfor.setCalTime(StringUtils.substring(b2BInvoiceListModel.getExTime(),0,7));
+                    carCalculateInfor.setFee(customer.getFee());
+                    carCalculateInfor.setEtcNum(b2BInvoiceListModel.getCardId());
+                    if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
+                        //todo 扣减客户金额
+                        calculateInforMapper.insert(carCalculateInfor);
+                    }
                     selfCarInvoices.add(selfCarInvoice);
                 }
             }

src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -10,6 +10,9 @@
         <result column="fee" property="fee"/>
         <result column="calculateTime" property="calculateTime"/>
         <result column="ctype" property="ctype"/>
+        <result column="buyerName" property="buyerName"/>
+        <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="invoiceMakeTime" property="invoiceMakeTime"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -19,12 +22,32 @@
         tradeId,
         fee,
         calculateTime,
-        ctype
+        ctype,
+        buyerName,
+        buyerTaxpayerCode,
+        invoiceMakeTime
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_CalculateInfor
+        <where>
+            <if test="calculateInfor.customId != null and calculateInfor.customId != ''">
+                and customId LIKE CONCAT('%',#{calculateInfor.customId},'%')
+            </if>
+            <if test="calculateInfor.buyerName != null and calculateInfor.buyerName != ''">
+                and buyerName LIKE CONCAT('%',#{calculateInfor.buyerName},'%')
+            </if>
+            <if test="calculateInfor.buyerTaxpayerCode != null and calculateInfor.buyerTaxpayerCode != ''">
+                and buyerTaxpayerCode = #{calculateInfor.buyerTaxpayerCode}
+            </if>
+            <if test="calculateInfor.invoiceMakeTime != null and calculateInfor.invoiceMakeTime != ''">
+                and invoiceMakeTime BETWEEN #{calculateInfor.invoiceMakeStart} and #{calculateInfor.invoiceMakeEnd}
+            </if>
+            <if test="calculateInfor.calculateTime != null and calculateInfor.calculateTime != ''">
+                and calculateTime BETWEEN #{calculateInfor.calculateStart} and #{calculateInfor.calculateEnd}
+            </if>
+        </where>
     </select>
     <select id="selectByTradeId" resultMap="BaseResultMap">
         select
@@ -38,10 +61,14 @@
         tradeId,
         fee,
         calculateTime,
-        ctype
+        ctype,
+        buyerName,
+        buyerTaxpayerCode,
+        invoiceMakeTime
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
         #{tradeId,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER},#{calculateTime,jdbcType=VARCHAR},#{ctype,jdbcType=INTEGER}
+        ,#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{invoiceMakeTime,jdbcType=VARCHAR}
         )
     </insert>
 </mapper>

src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -10,6 +10,7 @@
         <result column="fee" property="fee"/>
         <result column="calculateTime" property="calculateTime"/>
         <result column="ctype" property="ctype"/>
+        <result column="invoiceMkTime" property="invoiceMkTime"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -18,7 +19,8 @@
         companyNum,
         etcNum,
         fee,
-        calTime
+        calTime,
+        invoiceMkTime
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
@@ -36,10 +38,10 @@
         companyNum,
         etcNum,
         fee,
-        calTime
+        calTime,invoiceMkTime
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
-        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER},#{calTime,jdbcType=VARCHAR}
+        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR}
         )
     </insert>
 </mapper>

src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -51,12 +51,35 @@
         amount,
         tradeId,
         buyerName,
-        buyerTaxpayerCode
+        buyerTaxpayerCode,companyNum,companyName,customerName
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_SelfCarInvoice
+        <where>
+            <if test="selfCarInvoice.companyName != null and selfCarInvoice.companyName != ''">
+                and companyName LIKE CONCAT('%',#{selfCarInvoice.companyName},'%')
+            </if>
+            <if test="selfCarInvoice.tradeId != null and selfCarInvoice.tradeId != ''">
+                and tradeId = #{selfCarInvoice.tradeId}
+            </if>
+            <if test="selfCarInvoice.buyerTaxpayerCode != null and selfCarInvoice.buyerTaxpayerCode != ''">
+                and buyerTaxpayerCode = #{selfCarInvoice.buyerTaxpayerCode}
+            </if>
+            <if test="selfCarInvoice.cardId != null and selfCarInvoice.cardId != ''">
+                and cardId = #{selfCarInvoice.cardId}
+            </if>
+            <if test="selfCarInvoice.invoiceCode != null and selfCarInvoice.invoiceCode != ''">
+                and invoiceCode = #{selfCarInvoice.invoiceCode}
+            </if>
+            <if test="selfCarInvoice.invoiceNum != null and selfCarInvoice.invoiceNum != ''">
+                and invoiceNum = #{selfCarInvoice.invoiceNum}
+            </if>
+            <if test="selfCarInvoice.invoiceMakeStart != null and selfCarInvoice.invoiceMakeStart != ''">
+                and invoiceMakeTime BETWEEN #{selfCarInvoice.invoiceMakeStart} and #{selfCarInvoice.invoiceMakeEnd}
+            </if>
+        </where>
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice" >
         insert into t_SelfCarInvoice (
@@ -81,7 +104,7 @@
         amount,
         tradeId,
         buyerName,
-        buyerTaxpayerCode
+        buyerTaxpayerCode,companyNum,companyName,customerName
         )
         values ( #{cardId,jdbcType=VARCHAR}, #{invoiceNum,jdbcType=VARCHAR},
         #{invoiceCode,jdbcType=VARCHAR}, #{invoiceMakeTime,jdbcType=VARCHAR}, #{invoiceUrl,jdbcType=VARCHAR},
@@ -90,7 +113,7 @@
         #{plateNum,jdbcType=VARCHAR},#{vehicleType,jdbcType=INTEGER},#{sellerName,jdbcType=VARCHAR},
         #{sellerTaxpayerCode,jdbcType=VARCHAR},
          #{totalAmount,jdbcType=INTEGER}, #{taxRate,jdbcType=DOUBLE},#{invoiceType,jdbcType=VARCHAR},#{amount,jdbcType=INTEGER},
-        #{tradeId,jdbcType=VARCHAR},#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR}
+        #{tradeId,jdbcType=VARCHAR},#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{customerName,jdbcType=VARCHAR}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice" >
@@ -116,7 +139,10 @@
         amount			= #{amount,jdbcType=INTEGER},
         tradeId   = #{transactionId,jdbcType=VARCHAR},
         buyerName		= #{buyerName,jdbcType=VARCHAR},
-        buyerTaxpayerCode = #{buyerTaxpayerCode,jdbcType=VARCHAR}
+        buyerTaxpayerCode = #{buyerTaxpayerCode,jdbcType=VARCHAR},
+        companyNum = #{companyNum,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        customerName = #{customerName,jdbcType=VARCHAR}
         where id = #{id,jdbcType=INTEGER}
     </update>
     <select id="selectByTrade" resultMap="BaseResultMap" parameterType="java.lang.String" >

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -13,6 +13,8 @@
         <result column="fee" property="fee"/>
         <result column="status" property="status"/>
         <result column="applId" property="applId"/>
+        <result column="companyName" property="companyName"/>
+        <result column="companyReferencenum" property="companyReferencenum"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -25,12 +27,37 @@
         fee,
         status,
         applId,
-        aclTime
+        aclTime,
+        companyName,
+        companyReferencenum
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_SellCarTrade
+        <where>
+            <if test="sellCarTrade.companyName != null and sellCarTrade.companyName != ''">
+                and companyName LIKE CONCAT('%',#{sellCarTrade.companyName},'%')
+            </if>
+            <if test="sellCarTrade.cardId != null and sellCarTrade.cardId != ''">
+                and cardId = #{sellCarTrade.cardId}
+            </if>
+            <if test="sellCarTrade.companyReferencenum != null and sellCarTrade.companyReferencenum != ''">
+                and companyReferencenum = #{sellCarTrade.companyReferencenum}
+            </if>
+            <if test="sellCarTrade.tradeId != null and sellCarTrade.tradeId != ''">
+                and tradeId = #{sellCarTrade.tradeId}
+            </if>
+            <if test="sellCarTrade.exTimeBegin != null and sellCarTrade.exTimeBegin != ''">
+                and exTime BETWEEN #{sellCarTrade.exTimeBegin} and #{sellCarTrade.exTimeEnd}
+            </if>
+            <if test="sellCarTrade.aclTimeBegin != null and sellCarTrade.aclTimeBegin != ''">
+                and aclTime BETWEEN #{sellCarTrade.aclTimeBegin} and #{sellCarTrade.aclTimeEnd}
+            </if>
+            <if test="sellCarTrade.exceptionFlag != null and sellCarTrade.exceptionFlag != ''">
+                and date_add(aclTime,interval 10 day)>now() and status=2
+            </if>
+        </where>
     </select>
     <select id="selectByTradeId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -47,11 +74,14 @@
             fee,
             status,
             applId,
-            aclTime
+            aclTime,
+            companyName,
+            companyReferencenum
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
          #{cardId,jdbcType=VARCHAR}, #{tradeId,jdbcType=VARCHAR}, #{exTime,jdbcType=VARCHAR},
-         #{fee,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{applId,jdbcType=VARCHAR},#{aclTime,jdbcType=VARCHAR}
+         #{fee,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{applId,jdbcType=VARCHAR},#{aclTime,jdbcType=VARCHAR},
+         #{companyName,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.SelfCarTrade" >
@@ -64,7 +94,9 @@
         fee = #{fee,jdbcType=INTEGER},
         status = #{status,jdbcType=INTEGER},
         applId = #{applId,jdbcType=VARCHAR},
-        aclTime = #{aclTime,jdbcType=VARCHAR}
+        aclTime = #{aclTime,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        companyReferencenum = #{companyReferencenum,jdbcType=VARCHAR}
         where id = #{id,jdbcType=INTEGER}
     </update>
 
@@ -78,7 +110,9 @@
         fee = #{fee,jdbcType=INTEGER},
         status = #{status,jdbcType=INTEGER},
         applId = #{applId,jdbcType=VARCHAR},
-        aclTime = #{aclTime,jdbcType=VARCHAR}
+        aclTime = #{aclTime,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        companyReferencenum = #{companyReferencenum,jdbcType=VARCHAR}
         where tradeId = #{tradeId,jdbcType=INTEGER}
     </update>
 </mapper>