后端代码提交

src/main/java/com/jkcredit/invoice/annotation/MonyCheck.java

@@ -0,0 +1,14 @@
+package com.jkcredit.invoice.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 加入此注解后就会校验余额，当余额不足时不让发起
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MonyCheck {
+}

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

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.controller.localBussiness;
 
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
@@ -13,6 +14,7 @@ import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.util.DateUtil;
+import com.jkcredit.invoice.util.ExportUtil;
 import com.jkcredit.invoice.util.RespR;
 import com.jkcredit.invoice.util.WordUtil;
 import io.swagger.annotations.Api;
@@ -76,7 +78,34 @@ public class CustomerController {
 
         return new RespR(customerRechargeService.findAllCustomerRecharge(page, customerRecharge));
     }
+    /**
+     * 导出客户信息
+     * @param     customerRec response
+     * @return 用户集合
+     */
+    @GetMapping("/findCustomerRecListExport")
+    @ApiOperation(value="客户信息导出", notes="客户信息导出")
+    @LoginRequired
+    public void findCustomerRechargeExport(String  customerName,String companyName,String companyBelongName,HttpServletResponse response) throws Exception{
+        CustomerRec customerRec = new CustomerRec();
+        customerRec.setCustomerName(customerName);
+        customerRec.setCompanyBelongName(companyBelongName);
+        customerRec.setCompanyName(companyName);
+        List<CustomerRec> customerRecs = customerRecService.findAllCustomerRecForExport(customerRec);
 
+        if(customerRecs!=null && customerRecs.size()>0){
+            customerRecs.stream().forEach(customerRec1 -> {
+
+                if("2".equals(customerRec1.getBussinessType())){
+                    customerRec1.setBussinessType("无车");
+                }else if("0".equals(customerRec1.getBussinessType())){
+                    customerRec1.setBussinessType("自有车");
+                }
+            });
+        }
+        ExportParams exportParams = new ExportParams("客户信息","客户信息");
+        ExportUtil.exportExcel(customerRecs,CustomerRec.class,"客户信息导出",exportParams,response);
+    }
     /**
      * 分页查询客户注册信息
      *

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

@@ -2,6 +2,7 @@ package com.jkcredit.invoice.controller.localBussiness;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
@@ -145,10 +146,14 @@ public class NoCarController {
     @PostMapping("/updateStatus")
     @ApiOperation(value="重新获取发票并更新状态", notes="重新获取发票并更新状态")
     @LoginRequired
-    public RespR updateStatus() {
+    public RespR updateStatus(String noCarWayBillStr) {
+        List<NoCarWayBill> noCarWayBills = JSON.parseArray(noCarWayBillStr,NoCarWayBill.class);
         try {
-            delGetInvoce(0);
-            delGetInvoce(1);
+            if(noCarWayBills!=null && noCarWayBills.size()>0){
+                noCarWayBills.stream().forEach(noCarWayBill -> {
+                    noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+                });
+            }
             return new RespR("更新成功");
         }catch (Exception e){
             e.printStackTrace();
@@ -410,6 +415,29 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
+
+    /**
+     * 分页查询无车计费统计信息
+     *
+     * @param carCalculateInfor    参数集
+     * @return 用户集合
+     */
+    @PostMapping("/findNocarCalculateInfoStatis")
+    @ApiOperation(value="分页查询无车计费统计信息", notes="分页查询无车计费统计信息")
+    @LoginRequired
+    public RespR findNocarCalculateInfoStatis(NoCarCalculateInfor carCalculateInfor) {
+        try {
+            setTimeDue1(carCalculateInfor);
+            RespR respR = new RespR(noCarCalculateInfoService.findNocarCalculateInfoStatis(carCalculateInfor));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+
+
+
     @GetMapping("/templateDownload")
     @ApiOperation(value="模板下载", notes="模板下载")
     public RespR contractDownload(String fileName,HttpServletResponse response){

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

@@ -100,6 +100,7 @@ public class SimpleCORSFilter implements Filter {
             "/customer/findCustomer",
             "/customer/findCustomerRecharge",
             "/customer/findCustomerRecList",
+            "/customer/findCustomerRecListExport",
             "/customer/addCustomer",
             "/customer/updateCustomer",
             "/customer/addCustomer",
@@ -127,6 +128,7 @@ public class SimpleCORSFilter implements Filter {
             "/noCar/findBillWayException",
             "/noCar/findNocarInvoices",
             "/noCar/findNocarInvoicesStatic",
+            "/noCar/findNocarCalculateInfoStatis",
             "/noCar/findNocarCalculateInfo",
             "/noCar/templateDownload",
             "/noCar/batchImportNocarInvoices",

src/main/java/com/jkcredit/invoice/mapper/calculateInfor/NoCarCalculateInforMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface NoCarCalculateInforMapper extends BaseMapper<NoCarCalculateInfor> {
@@ -16,4 +17,6 @@ public interface NoCarCalculateInforMapper extends BaseMapper<NoCarCalculateInfo
     int insert(NoCarCalculateInfor record);
 
     NoCarCalculateInfor selectByTradeId(String tradeId);
+
+    List<Map<String,String>> selectforStatis(@Param("calculateInfor") NoCarCalculateInfor record);
 }

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

@@ -31,4 +31,6 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
 
     int updateByPrimaryKey(CustomerRec record);
     IPage<List<CustomerRec>> selectAllByPage(Page page, @Param("customerRec") CustomerRec customerRec);
+
+    List<CustomerRec> selectAllByPageExport( @Param("customerRec") CustomerRec customerRec);
 }

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

@@ -25,4 +25,6 @@ public interface CustomerRechargeMapper extends BaseMapper<CustomerRecharge> {
     int updateByPrimaryKeySelective(CustomerRecharge record);
 
     int updateByPrimaryKey(CustomerRecharge record);
+
+    List<CustomerRecharge> findAllCustomerRechargeForExport(CustomerRecharge customerRecharge);
 }

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

@@ -1,12 +1,15 @@
 package com.jkcredit.invoice.model.entity;
 
-import java.util.Date;
-
 public class CustomerRecharge {
     private Long id;
 
     private String customerName;
 
+    /**
+     * 客户主体名称
+     */
+    private String companyName;
+
     private Double beforeMony;
 
     private Double rechargeMony;
@@ -52,4 +55,12 @@ public class CustomerRecharge {
     public void setRechargeTime(String rechargeTime) {
         this.rechargeTime = rechargeTime;
     }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
 }

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

@@ -35,6 +35,11 @@ public class Customer {
 
     private String company;
 
+    /**
+     * 子公司,用于查询
+     */
+    private String subCompany;
+
     public Integer getId() {
         return id;
     }
@@ -148,6 +153,14 @@ public class Customer {
         this.company = company == null ? null : company.trim();
     }
 
+    public String getSubCompany() {
+        return subCompany;
+    }
+
+    public void setSubCompany(String subCompany) {
+        this.subCompany = subCompany;
+    }
+
     @Override
     public String toString() {
         return "Customer{" +

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

@@ -1,4 +1,7 @@
 package com.jkcredit.invoice.model.entity.customer;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+
 /**
  * 客户备案信息
  */
@@ -22,6 +25,7 @@ public class CustomerRec {
     /**
      * 公司名称
      */
+    @Excel(name = "公司名称")
     private String companyName;
 
     /**
@@ -71,7 +75,7 @@ public class CustomerRec {
 
 
     private String createtime;
-
+    @Excel(name = "主体名称")
     private String companyBelongName;
     /**
      * 2-失败 1-成功 3-等待协议上传 4-停用 0-备案中
@@ -83,6 +87,7 @@ public class CustomerRec {
     /**
      * 业务类型 0 -自有车 1-外协车 2-无车
      */
+    @Excel(name = "业务类型")
     private String bussinessType;
 
     /*协议相关字段*/

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

@@ -136,6 +136,16 @@ public class BillInvoice {
      */
     private String buyerTaxpayerCode;
 
+    /**
+     * 运单状态
+     */
+    private String billStatus;
+
+    /**
+     * 计费时间
+     */
+    private String calculateTime;
+
 
 
     public String getInvoiceNum() {
@@ -394,6 +404,22 @@ public class BillInvoice {
         this.invoiceMakeEnd = invoiceMakeEnd;
     }
 
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus;
+    }
+
+    public String getCalculateTime() {
+        return calculateTime;
+    }
+
+    public void setCalculateTime(String calculateTime) {
+        this.calculateTime = calculateTime;
+    }
+
     @Override
     public String toString() {
         return "BillInvoice{" +

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

@@ -115,6 +115,16 @@ public class SelfCarInvoice {
      */
     private String buyerTaxpayerCode;
 
+    /**
+     * 交易状态
+     */
+    private String tradeStatus;
+
+    /**
+     * 计费时间
+     */
+    private String calculateTime;
+
     public Long getId() {
         return id;
     }
@@ -339,6 +349,22 @@ public class SelfCarInvoice {
         this.invoiceMakeEnd = invoiceMakeEnd;
     }
 
+    public String getTradeStatus() {
+        return tradeStatus;
+    }
+
+    public void setTradeStatus(String tradeStatus) {
+        this.tradeStatus = tradeStatus;
+    }
+
+    public String getCalculateTime() {
+        return calculateTime;
+    }
+
+    public void setCalculateTime(String calculateTime) {
+        this.calculateTime = calculateTime;
+    }
+
     @Override
     public String toString() {
         return "SelfCarInvoice{" +

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

@@ -104,7 +104,7 @@ public class NoCarWayBill implements Cloneable{
     private String updateTime;
 
     /**
-     * 运单转态 -1-导入 -2失败  1-指令开始 2-开票中  3-开票完成 4 超时作废
+     * 运单转态 -1-导入 -2失败 -3 结束指令上传失败  1-指令开始 2-开票中  3-开票完成 4 超时作废
      */
     private int billwayStatus;
 
@@ -161,6 +161,8 @@ public class NoCarWayBill implements Cloneable{
 
     private String endEnd;
 
+    private String days;
+
     public Long getId() {
         return id;
     }
@@ -433,6 +435,14 @@ public class NoCarWayBill implements Cloneable{
         this.failReason = failReason;
     }
 
+    public String getDays() {
+        return days;
+    }
+
+    public void setDays(String days) {
+        this.days = days;
+    }
+
     @Override
     public NoCarWayBill clone() throws CloneNotSupportedException {
         return (NoCarWayBill)super.clone();

src/main/java/com/jkcredit/invoice/service/CalculateInfor/NoCarCalculateInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 无车计费服务
@@ -16,4 +17,11 @@ public interface NoCarCalculateInfoService {
      * @return
      */
     IPage<List<NoCarCalculateInfor>> findByPageAndCalculateInfor(Page page, NoCarCalculateInfor calculateInfor);
+
+    /**
+     * 查询所有计费统计服务接口
+     * @param calculateInfor
+     * @return
+     */
+    List<Map<String,String>> findNocarCalculateInfoStatis(NoCarCalculateInfor calculateInfor);
 }

src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/NocarCalculateInfoServiceImpl.java

@@ -3,19 +3,38 @@ 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.calculateInfor.NoCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class NocarCalculateInfoServiceImpl extends ServiceImpl<NoCarCalculateInforMapper,NoCarCalculateInfor> implements NoCarCalculateInfoService {
     @Autowired
     NoCarCalculateInforMapper noCarCalculateInforMapper;
+
+    @Autowired
+    CustomerMapper customerMapper;
     @Override
     public IPage<List<NoCarCalculateInfor>> findByPageAndCalculateInfor(Page page, NoCarCalculateInfor calculateInfor) {
         return noCarCalculateInforMapper.selectAllByPage(page,calculateInfor);
     }
+
+    @Override
+    public List<Map<String,String>> findNocarCalculateInfoStatis(NoCarCalculateInfor calculateInfor) {
+        List<Map<String,String>> list = noCarCalculateInforMapper.selectforStatis(calculateInfor);
+        for(Map<String,String> map:list){
+            String customId = map.get("customId");
+            Customer customer = customerMapper.selectByCustomerName(customId);
+            if(customer!=null){
+                map.put("customId",customer.getCompany());
+            }
+        }
+        return list;
+    }
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 
+import java.util.List;
+
 public interface CustomerRecService {
     /**
      * 查找所有备案信息
@@ -12,4 +14,6 @@ public interface CustomerRecService {
      * @return
      */
     IPage findAllCustomerRec(Page page, CustomerRec customerRec);
+
+    List<CustomerRec> findAllCustomerRecForExport(CustomerRec customerRec);
 }

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

@@ -9,6 +9,8 @@ import com.jkcredit.invoice.service.customer.CustomerRecService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("customerRecService")
 public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,CustomerRec>   implements CustomerRecService{
     @Autowired
@@ -17,4 +19,9 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
     public IPage findAllCustomerRec(Page page, CustomerRec customerRec) {
         return customerRecMapper.selectAllByPage(page,customerRec);
     }
+
+    @Override
+    public List<CustomerRec> findAllCustomerRecForExport(CustomerRec customerRec) {
+        return customerRecMapper.selectAllByPageExport(customerRec);
+    }
 }

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

@@ -76,6 +76,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         customerMapper.updateByPrimaryKeySelective(customer);
         customerRecharge.setRechargeTime(DateUtil.getCurrentDateStr());
         customerRecharge.setBeforeMony(customer.getAccountBalance());
+        customerRecharge.setCompanyName(customer.getCompany());
         customerRechargeMapper.insert(customerRecharge);
         log.info("充值结束：CustomerServiceImpl.customRecharge{}",customerRecharge);
         return true;

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

@@ -38,6 +38,8 @@ import org.springframework.util.StringUtils;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+
 @Slf4j
 @Repository("noCarService")
 public class NoCarServiceImpl implements NoCarService{
@@ -386,8 +388,9 @@ public class NoCarServiceImpl implements NoCarService{
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
+        //todo 这里再设计一下
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill1.setBillwayStatus(4);
+            noCarWayBill1.setBillwayStatus(-3);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"运单已经超时，请拆分");
@@ -415,7 +418,7 @@ public class NoCarServiceImpl implements NoCarService{
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
         noCarWayBill1.setBillwayStatus(2);
-        noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
+        noCarWayBill1.setUpdateTime(DateUtil.getCurrentDateStr());
         noCarWaybillMapper.updateByBillNum(noCarWayBill1);
         return new RespR();
     }
@@ -531,14 +534,19 @@ public class NoCarServiceImpl implements NoCarService{
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         redQueryRequest.setCompanyNum(companyNum);
         redQueryRequest.setMonth(hcInvoiceQueryVo.getMonth());
+
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);
         if(respR.getCode() == 1){
             log.info("取红冲票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",hcInvoiceQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
-        return new RespR(respR.getData().getResult());
-    }
+        if(StringUtils.isEmpty(hcInvoiceQueryVo.getCompanyName())){
+            return new RespR(respR.getData().getResult());
+        }else{
+            return new RespR(respR.getData().getResult().stream().filter(ele->ele.getBuyerName().equals(hcInvoiceQueryVo.getCompanyName())).collect(Collectors.toList()));
+        }
 
+    }
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
         log.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");

src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="d:/logs"/>
+    <property name="log.path" value="/home/app/logs"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />

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

@@ -49,6 +49,37 @@
             </if>
         </where>
     </select>
+    <resultMap id="staticResultMap" type="java.util.Map">
+        <result column="customId" property="customId"/>
+        <result column="buyerName" property="buyerName"/>
+        <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="feeCount" property="feeCount"/>
+    </resultMap>
+    <select id="selectforStatis" resultMap="staticResultMap">
+        select
+         customId,buyerName,buyerTaxpayerCode,count(1) feeCount
+        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>
+
+        group by customId,buyerName,buyerTaxpayerCode
+    </select>
+
     <select id="selectByTradeId" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />

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

@@ -28,6 +28,18 @@
         select
         <include refid="baseSql" />
         from t_SelfCalculateInfor
+        <if test="customId != null and customId != ''">
+            and customId LIKE CONCAT('%',#{customId},'%')
+        </if>
+        <if test="companyReferencenum != null and companyReferencenum != ''">
+            and companyReferencenum =#{companyReferencenum}
+        </if>
+        <if test="etcNum != null and etcNum != ''">
+            and etcNum = #{etcNum}
+        </if>
+        <if test="calTime != null and calTime != ''">
+            and calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+        </if>
     </select>
     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
         select

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

@@ -55,6 +55,12 @@
       <if test="customer.customerName != null and customer.customerName != ''">
         and customer_name LIKE CONCAT('%',#{customer.customerName},'%')
       </if>
+      <if test="customer.company != null and customer.company != ''">
+        and company LIKE CONCAT('%',#{customer.company},'%')
+      </if>
+      <if test="customer.subCompany != null and customer.subCompany != ''">
+        and EXISTS (select 1 from t_customer_rec t where t.customerName = customer_name and t.company_Name LIKE CONCAT('%',#{customer.subCompany},'%'))
+      </if>
     </where>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >

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

@@ -54,11 +54,31 @@
     <if test="customerRec.companyName != null and customerRec.companyName != ''">
       and company_name = #{customerRec.companyName}
     </if>
+      <if test="customerRec.companyBelongName != null and customerRec.companyBelongName != ''">
+        and company_belong_name  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')
+      </if>
       <if test="customerRec.serviceEndTimeStart != null and customerRec.serviceEndTimeStart != ''">
         and service_endTime BETWEEN #{customerRec.serviceEndTimeStart} and #{customerRec.serviceEndTimeEnd}
       </if>
     </where>
   </select>
+  <select id="selectAllByPageExport" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_rec
+    <where>
+      <if test="customerRec.customerName != null and customerRec.customerName != ''">
+        AND  customerName LIKE CONCAT('%',#{customerRec.customerName},'%')
+      </if>
+      <if test="customerRec.companyName != null and customerRec.companyName != ''">
+        and company_name  LIKE CONCAT('%',#{customerRec.companyName},'%')
+      </if>
+      <if test="customerRec.companyBelongName != null and customerRec.companyBelongName != ''">
+        and company_belong_name  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')
+      </if>
+    </where>
+    ORDER by customerName
+  </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />

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

@@ -4,12 +4,13 @@
   <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.CustomerRecharge" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="companyName" property="companyName" jdbcType="VARCHAR" />
     <result column="before_money" property="beforeMony" jdbcType="DOUBLE" />
     <result column="recharge_mony" property="rechargeMony" jdbcType="DOUBLE" />
     <result column="recharge_time" property="rechargeTime" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, customer_name, before_money, recharge_mony, recharge_time
+    id, customer_name,companyName, before_money, recharge_mony, recharge_time
   </sql>
   <select id="selectAllByPage" resultMap="BaseResultMap">
     select
@@ -19,6 +20,9 @@
       <if test="customerRecharge.customerName != null and customerRecharge.customerName != ''">
         and customer_name LIKE CONCAT('%',#{customerRecharge.customerName},'%')
       </if>
+      <if test="customerRecharge.companyName != null and customerRecharge.companyName != ''">
+        and companyName LIKE CONCAT('%',#{customerRecharge.companyName},'%')
+      </if>
     </where>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -32,9 +36,9 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.CustomerRecharge" >
-    insert into t_customer_recharge ( customer_name, before_money,recharge_mony,
+    insert into t_customer_recharge ( customer_name,companyName, before_money,recharge_mony,
       recharge_time)
-    values ( #{customerName,jdbcType=VARCHAR}, #{beforeMony,jdbcType=DOUBLE}, #{rechargeMony,jdbcType=DOUBLE},
+    values ( #{customerName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{beforeMony,jdbcType=DOUBLE}, #{rechargeMony,jdbcType=DOUBLE},
       #{rechargeTime,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jkcredit.invoice.model.entity.CustomerRecharge" >
@@ -46,6 +50,9 @@
       <if test="customerName != null" >
         customer_name,
       </if>
+      <if test="companyName != null" >
+        companyName,
+      </if>
       <if test="beforeMony != null" >
         before_money,
       </if>
@@ -63,6 +70,9 @@
       <if test="customerName != null" >
         #{customerName,jdbcType=VARCHAR},
       </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
       <if test="beforeMony != null" >
         #{before_money,jdbcType=DOUBLE},
       </if>
@@ -80,6 +90,9 @@
       <if test="customerName != null" >
         customer_name = #{customerName,jdbcType=VARCHAR},
       </if>
+      <if test="companyName != null" >
+        companyName = #{companyName,jdbcType=VARCHAR},
+      </if>
       <if test="beforeMony != null" >
         before_money = #{beforeMony,jdbcType=DOUBLE},
       </if>
@@ -95,6 +108,7 @@
   <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.CustomerRecharge" >
     update t_customer_recharge
     set customer_name = #{customerName,jdbcType=VARCHAR},
+    companyName = #{companyName,jdbcType=VARCHAR},
       before_money = #{beforeMony,jdbcType=DOUBLE},
       recharge_mony = #{rechargeMony,jdbcType=DOUBLE},
       recharge_time = #{rechargeTime,jdbcType=VARCHAR}

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

@@ -34,6 +34,8 @@
         <result column="tradeMatchTime" property="tradeMatchTime"/>
         <result column="buyerName" property="buyerName"/>
         <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="billStatus" property="billStatus"/>
+        <result column="calculateTime" property="calculateTime"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -70,7 +72,7 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />
+        <include refid="baseSql" />,(select billwayStatus from t_waybill_no f where f.billNum = waybillNum) billStatus ,(SELECT  g.calculateTime from t_CalculateInfor g where g.tradeId = transactionId) calculateTime
         from t_billInvoice
         <where>
             <if test="billInvoice.companyName != null and billInvoice.companyName != ''">

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

@@ -26,6 +26,8 @@
         <result column="tradeId" property="tradeId"/>
         <result column="buyerName" property="buyerName"/>
         <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="tradeStatus" property="tradeStatus"/>
+        <result column="calculateTime" property="calculateTime"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -55,7 +57,7 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />
+        <include refid="baseSql" />,(select t.status from t_SellCarTrade t where t.tradeId = tradeId ) tradeStatus,(select f.calTime from t_SelfCalculateInfor f where f.etcNum = cardId and find_in_set(exTime,f.calTime)) calculateTime
         from t_SelfCarInvoice
         <where>
             <if test="selfCarInvoice.companyName != null and selfCarInvoice.companyName != ''">

src/main/resources/mapper/user/UserMapper.xml

@@ -65,7 +65,7 @@
                 and user_name LIKE CONCAT('%',#{query.userName},'%')
             </if>
             <if test="query.company != null and query.company != ''">
-                and company = #{query.company}
+                and company  LIKE CONCAT('%',#{query.company},'%')
             </if>
         </where>
         order by create_time desc

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

@@ -25,6 +25,8 @@
         <result column="companyBankAcc" property="companyBankAcc"/>
         <result column="companyTel" property="companyTel"/>
         <result column="updateTime" property="updateTime"/>
+        <result column="days" property="days"/>
+
     </resultMap>
 
     <sql id="baseSql">
@@ -87,7 +89,7 @@
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />
+        <include refid="baseSql" />,timestampdiff(day,InterfaceEndTime,now()) days
         from t_waybill_no
         <where>
             <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">