优化代码提交

src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java

@@ -8,8 +8,10 @@ import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.CustomerRecharge;
+import com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.manager.Param;
+import com.jkcredit.invoice.service.customer.CustomerChangeInfoService;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.customer.CustomerRechargeService;
 import com.jkcredit.invoice.service.customer.CustomerService;
@@ -435,5 +437,17 @@ public class CustomerController {
         IPage ipage = customerRecService.findAllCustomerRec(page, customerRec);
         return new RespR(ipage);
     }
-
+    @Autowired
+   CustomerChangeInfoService customerChangeInfoService;
+    /**
+     * @param customerEtcChangeInfo
+     * @return
+     */
+    @PostMapping("/customerEtcChangeInfo")
+    @ApiOperation(value="用户换卡信息查询", notes="用户换卡信息查询")
+    @LoginRequired
+    public RespR customeChangeInfoListByPage(Page page, CustomerEtcChangeInfo customerEtcChangeInfo){
+        IPage ipage = customerChangeInfoService.findAllCustomerChangeInfo(page, customerEtcChangeInfo);
+        return new RespR(ipage);
+    }
 }

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -118,6 +118,7 @@ public class SimpleCORSFilter implements Filter {
             "/customer/findCustomerRecTimeList",
             "/customer/findCustomerMoney",
             "/customer/customeRecQueryListByPage",
+            "/customer/customeChangeInfoListByPage",
             "/customer/customeRecQueryUpper",
             "/customer/contractStatusFail",
             "/customer/contractStatusProcess",

src/main/java/com/jkcredit/invoice/credit/dto/CardChangeDto.java

@@ -9,6 +9,10 @@ import java.util.ArrayList;
  */
 public class CardChangeDto {
     /**
+     * 客户名称
+     */
+    private String customerId;
+    /**
      *原公司编号
      */
     private String companyNum;
@@ -33,6 +37,14 @@ public class CardChangeDto {
      */
     private ArrayList<String> cardIdList;
 
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
     public String getCompanyNum() {
         return companyNum;
     }

src/main/java/com/jkcredit/invoice/credit/interserver/SelfCarInterServiceImpl.java

@@ -894,6 +894,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
             cardChangeDto.setCompanyName(customerRec1.getCompanyName());
+            cardChangeDto.setCustomerId(customerRec1.getCustomerName());
             RespR rs = selfCarService.customerCardChange(cardChangeDto);
             long costtimeend = System.currentTimeMillis();
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerChangeInfoMapper.java

@@ -1,12 +1,18 @@
 package com.jkcredit.invoice.mapper.customer;
-
-import com.jkcredit.invoice.model.entity.customer.CustometEtcChangeInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
-public interface CustomerChangeInfoMapper {
-    void insertCardChangeInfo(CustometEtcChangeInfo custometEtcChangeInfo);
+public interface CustomerChangeInfoMapper extends BaseMapper<CustomerEtcChangeInfo> {
+    void insertCardChangeInfo(CustomerEtcChangeInfo custometEtcChangeInfo);
 
     void insertChangeCard(@Param("applyId") String applyId, @Param("cardId") String cardId);
+
+    IPage<List<CustomerEtcChangeInfo>> selectAllByPage(Page page, @Param("custometEtcChangeInfo") CustomerEtcChangeInfo custometEtcChangeInfo);
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustometEtcChangeInfo.java

@@ -4,7 +4,12 @@ import com.jkcredit.invoice.credit.dto.CardChangeDto;
 
 import java.util.ArrayList;
 
-public class CustometEtcChangeInfo {
+public class CustomerEtcChangeInfo {
+
+    /**
+     * 客户名称
+     */
+    private String customerId;
     /**
      *原公司编号
      */
@@ -76,7 +81,16 @@ public class CustometEtcChangeInfo {
         this.targetCompanyName = targetCompanyName;
     }
 
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
     public  void copyFromChangeDto(CardChangeDto cardChangeDto){
+        this.setCustomerId(cardChangeDto.getCustomerId());
         this.companyName = cardChangeDto.getCompanyName();
         this.companyNum = cardChangeDto.getCompanyNum();
         this.targetCompanyName = cardChangeDto.getTargetCompanyName();

src/main/java/com/jkcredit/invoice/service/customer/CustomerChangeInfoService.java

@@ -0,0 +1,10 @@
+package com.jkcredit.invoice.service.customer;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo;
+
+public interface CustomerChangeInfoService {
+
+    IPage findAllCustomerChangeInfo(Page page, CustomerEtcChangeInfo custometEtcChangeInfo);
+}

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerChangeInfoServiceImpl.java

@@ -0,0 +1,21 @@
+package com.jkcredit.invoice.service.customer.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jkcredit.invoice.mapper.customer.CustomerChangeInfoMapper;
+import com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo;
+import com.jkcredit.invoice.service.customer.CustomerChangeInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("customerChangeInfoService")
+public class CustomerChangeInfoServiceImpl extends ServiceImpl<CustomerChangeInfoMapper,CustomerEtcChangeInfo> implements CustomerChangeInfoService{
+
+    @Autowired
+    CustomerChangeInfoMapper customerChangeInfoMapper;
+    @Override
+    public IPage findAllCustomerChangeInfo(Page page, CustomerEtcChangeInfo custometEtcChangeInfo) {
+        return customerChangeInfoMapper.selectAllByPage(page,custometEtcChangeInfo);
+    }
+}

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

@@ -19,7 +19,7 @@ import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
-import com.jkcredit.invoice.model.entity.customer.CustometEtcChangeInfo;
+import com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
@@ -631,7 +631,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     customerChangeInfoMapper.insertChangeCard(applyId,card);
                 });
                 //2.换绑信息入库
-                CustometEtcChangeInfo custometEtcChangeInfo = new CustometEtcChangeInfo();
+                CustomerEtcChangeInfo custometEtcChangeInfo = new CustomerEtcChangeInfo();
                 custometEtcChangeInfo.copyFromChangeDto(cardChangeDto);
                 custometEtcChangeInfo.setApplyId(applyId);
                 customerChangeInfoMapper.insertCardChangeInfo(custometEtcChangeInfo);

src/main/resources/mapper/customer/CustomerChangeInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jkcredit.invoice.mapper.customer.CustomerChangeInfoMapper">
-  <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.customer.CustometEtcChangeInfo">
+  <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo">
     <result column="customerId" jdbcType="VARCHAR" property="customerId" />
     <result column="companyName" jdbcType="VARCHAR" property="companyName" />
     <result column="companyNum" jdbcType="VARCHAR" property="companyNum" />
@@ -14,7 +14,21 @@
   <sql id="Base_Column_List">
      customerId,companyName,companyNum,targetCompanyName,targetcompanyNum,applyId,changeTime,info
   </sql>
-  <insert id="insertCardChangeInfo" parameterType="com.jkcredit.invoice.model.entity.customer.CustometEtcChangeInfo">
+    <select id="selectAllByPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from t_change_card_info
+        <where>
+            <if test="custometEtcChangeInfo.customerId != null and customer.customerId != ''">
+                and  customerId = BINARY #{custometEtcChangeInfo.customerId}
+            </if>
+
+            <if test="custometEtcChangeInfo.companyName != null and custometEtcChangeInfo.companyName != ''">
+                and  companyName = BINARY #{custometEtcChangeInfo.companyName}
+            </if>
+        </where>
+    </select>
+  <insert id="insertCardChangeInfo" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerEtcChangeInfo">
       insert into t_change_card_info (customerId,companyName,companyNum,targetCompanyName,targetcompanyNum,applyId,changeTime,info)
       values (#{customerId,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR}, #{targetCompanyName,jdbcType=VARCHAR},
       #{targetcompanyNum,jdbcType=VARCHAR}, #{applyId,jdbcType=VARCHAR}, #{changeTime,jdbcType=VARCHAR},