后端代码提交

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

@@ -7,9 +7,11 @@ import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
 import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
+import com.jkcredit.invoice.model.entity.customer.CustomerOper;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
+import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
@@ -27,6 +29,9 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 @Api(tags = "无车操作")
@@ -50,6 +55,9 @@ public class NoCarController {
 
     @Autowired
     NoCarService noCarService;
+
+    @Autowired
+    CustomerOperService customerOperService;
     /**
      * 分页查询无车备案信息
      *
@@ -184,14 +192,40 @@ public class NoCarController {
     @PostMapping("/batchImprotBillWay")
     @ApiOperation(value="批量运单导入", notes="批量运单导入")
     @LoginRequired
-    public RespR batchImprotBillWay(@RequestParam("file") MultipartFile file) {
+    public RespR batchImprotBillWay(@RequestParam("file") MultipartFile file,String customerName) {
         try {
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
-            params.setHeadRows(2);
-            params.setKeyIndex(1);
+            params.setHeadRows(1);
+            params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
-            RespR respR = noCarBillWayService.batchBillWayStart(list);
+            buildDate(list);
+            RespR respR = noCarBillWayService.batchBillWayStart(list,customerName);
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+
+    /**
+     * 批量运单导入
+     *
+     * @param file    参数集
+     * @return
+     */
+    @PostMapping("/batchImprotHistoryBillWay")
+    @ApiOperation(value="批量历史运单导入", notes="批量历史运单导入")
+    @LoginRequired
+    public RespR batchImprotHistoryBillWay(@RequestParam("file") MultipartFile file,String customerName) {
+        try {
+            ImportParams params = new ImportParams();
+            params.setTitleRows(1);
+            params.setHeadRows(1);
+            params.setKeyIndex(2);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);list.remove(0);
+            buildDate(list);
+            RespR respR = noCarBillWayService.batchHsitoryBillWay(list,customerName);
             return respR;
         }catch (Exception e){
             e.printStackTrace();
@@ -199,6 +233,64 @@ public class NoCarController {
         }
     }
     /**
+     * 批量运单导入
+     *
+     * @param file    参数集
+     * @return
+     */
+    @PostMapping("/batchImprotEndBillWay")
+    @ApiOperation(value="批量运单结束", notes="批量运单结束")
+    @LoginRequired
+    public RespR batchImprotEndBillWay(@RequestParam("file") MultipartFile file,String customerName) {
+        try {
+            ImportParams params = new ImportParams();
+            params.setTitleRows(1);
+            params.setHeadRows(1);
+            params.setKeyIndex(2);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);list.remove(0);
+            buildDateEnd(list);
+            RespR respR = noCarBillWayService.batchBillWayEnd(list,customerName);
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+    public void buildDate(List<NoCarWayBill> list){
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+        for(NoCarWayBill noCarWayBill:list){
+            noCarWayBill.setStartTime(format.format(noCarWayBill.getStartTimeDate()));
+            noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getPredictEndTimeDate()));
+            noCarWayBill.setFee(Math.round(noCarWayBill.getFeeD()*100));
+        }
+    }
+    public void buildDateEnd(List<NoCarWayBill> list){
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:MM:ss");
+        for(NoCarWayBill noCarWayBill:list){
+            noCarWayBill.setPredictEndTime(format.format(noCarWayBill.getActEndTimeDate()));
+        }
+    }
+    /**
+     * 分页查询无车计费信息
+     *
+     * @param page    参数集
+     * @return 用户集合
+     */
+    @PostMapping("/findBatchList")
+    @ApiOperation(value="运单批次号查询", notes="运单批次号查询")
+    @LoginRequired
+    public RespR findBatchList(Page page, CustomerOper customerOper) {
+        try {
+
+            RespR respR = new RespR(customerOperService.findAllCustomerOper(page, customerOper));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+
+    /**
      * 分页查询无车计费信息
      *
      * @param page    参数集

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

@@ -0,0 +1,20 @@
+package com.jkcredit.invoice.mapper.customer;
+
+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.CustomerRecharge;
+import com.jkcredit.invoice.model.entity.customer.CustomerOper;
+import com.jkcredit.invoice.model.entity.customer.CustomerRec;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomerOperMapper extends BaseMapper<CustomerOper> {
+
+    IPage<List<CustomerOper>> selectAllByPage(Page page, @Param("customerOper") CustomerOper customerOper);
+
+    int insert(CustomerOper record);
+}

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

@@ -23,7 +23,7 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
 
     CustomerRec selectByCustomerNameAndCompany(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record);
-
+    CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record);
     int updateByPrimaryKeySelective(CustomerRec record);
 
     int updateByPrimaryKey(CustomerRec record);

src/main/java/com/jkcredit/invoice/mapper/user/UserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.user.User;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @create: 2019-05-28 17:47
  * @version: V1.0
  **/
+@Repository
 public interface UserMapper extends BaseMapper<User> {
 
     /**

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

@@ -0,0 +1,75 @@
+package com.jkcredit.invoice.model.entity.customer;
+
+public class CustomerOper {
+    private Long id;
+
+    private String customerName;
+
+    private String customerPhone;
+
+    private String company;
+
+    private String createTime;
+
+    private String batchNumber;
+    /**
+     * 1-运单开始,2-运单结束 3 历史运单操作
+     */
+    private int operType;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerPhone() {
+        return customerPhone;
+    }
+
+    public void setCustomerPhone(String customerPhone) {
+        this.customerPhone = customerPhone;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public int getOperType() {
+        return operType;
+    }
+
+    public void setOperType(int operType) {
+        this.operType = operType;
+    }
+}

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

@@ -2,6 +2,8 @@ package com.jkcredit.invoice.model.entity.waybill;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 无车实体类
  */
@@ -40,9 +42,10 @@ public class NoCarWayBill {
     /**
      * 运单开始时间
      */
-    @Excel(name = "运单开始时间",format="yyyy-MM-dd HH:mm:ss",databaseFormat = "yyyy-MM-dd HH:mm:ss")
     private String startTime;
 
+    @Excel(name = "运单开始时间",format="yyyy-MM-dd HH:mm:ss",databaseFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startTimeDate;
     /**
      * 运单开始地址
      */
@@ -58,15 +61,22 @@ public class NoCarWayBill {
     /**
      * 运单预计完成时间
      */
-    @Excel(name = "运单预计完成时间",format="yyyy-MM-dd HH:mm:ss",databaseFormat = "yyyy-MM-dd HH:mm:ss")
     private String predictEndTime;
 
+    @Excel(name = "运单预计完成时间",format="yyyy-MM-dd HH:mm:ss",databaseFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date predictEndTimeDate;
+
+    @Excel(name = "运单实际结束时间",format="yyyy-MM-dd HH:mm:ss",databaseFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date actEndTimeDate;
+
     /**
      * 运单费用 分
      */
-    @Excel(name = "运单费用")
     private Long fee;
 
+    @Excel(name = "运单费用")
+    private Double feeD;
+
     /**
      * 发票抬头类型 1-默认发票抬头 2-自定义发票抬头
      */
@@ -94,14 +104,14 @@ public class NoCarWayBill {
     private String updateTime;
 
     /**
-     * 运单转态  1-指令开始 2-开票中  3-开票完成 4 超时作废
+     * 运单转态   1-指令开始 2-开票中  3-开票完成 4 超时作废
      */
     private int billwayStatus;
 
     /**
      * 运单类型 0-实时运单 1-历史运单
      */
-    private int hisFlag = 0;
+    private Integer hisFlag = 0;
 
     /**
      * 行云公司编号
@@ -124,6 +134,16 @@ public class NoCarWayBill {
     private String companyBankAcc;
 
     /**
+     * 平台操作批次号
+     */
+    private String batchNum;
+
+    /**
+     * 平台操作结束批次号
+     */
+    private String batchNumEnd;
+
+    /**
      * 单位电话
      */
     private String companyTel;
@@ -264,11 +284,11 @@ public class NoCarWayBill {
         this.billwayStatus = billwayStatus;
     }
 
-    public int getHisFlag() {
+    public Integer getHisFlag() {
         return hisFlag;
     }
 
-    public void setHisFlag(int hisFlag) {
+    public void setHisFlag(Integer hisFlag) {
         this.hisFlag = hisFlag;
     }
 
@@ -351,4 +371,52 @@ public class NoCarWayBill {
     public void setEndEnd(String endEnd) {
         this.endEnd = endEnd;
     }
+
+    public String getBatchNum() {
+        return batchNum;
+    }
+
+    public void setBatchNum(String batchNum) {
+        this.batchNum = batchNum;
+    }
+
+    public Date getStartTimeDate() {
+        return startTimeDate;
+    }
+
+    public void setStartTimeDate(Date startTimeDate) {
+        this.startTimeDate = startTimeDate;
+    }
+
+    public Date getPredictEndTimeDate() {
+        return predictEndTimeDate;
+    }
+
+    public void setPredictEndTimeDate(Date predictEndTimeDate) {
+        this.predictEndTimeDate = predictEndTimeDate;
+    }
+
+    public Double getFeeD() {
+        return feeD;
+    }
+
+    public void setFeeD(Double feeD) {
+        this.feeD = feeD;
+    }
+
+    public String getBatchNumEnd() {
+        return batchNumEnd;
+    }
+
+    public void setBatchNumEnd(String batchNumEnd) {
+        this.batchNumEnd = batchNumEnd;
+    }
+
+    public Date getActEndTimeDate() {
+        return actEndTimeDate;
+    }
+
+    public void setActEndTimeDate(Date actEndTimeDate) {
+        this.actEndTimeDate = actEndTimeDate;
+    }
 }

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

@@ -0,0 +1,18 @@
+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.CustomerOper;
+
+public interface CustomerOperService {
+
+    /**
+     * 查找所有备案信息
+     * @param page
+     * @param customerOper
+     * @return
+     */
+    IPage findAllCustomerOper(Page page, CustomerOper customerOper);
+
+    String  saveCustomerOper(String customerName,int operType);
+}

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

@@ -0,0 +1,41 @@
+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.CustomerOperMapper;
+import com.jkcredit.invoice.mapper.user.UserMapper;
+import com.jkcredit.invoice.model.entity.customer.CustomerOper;
+import com.jkcredit.invoice.model.entity.user.User;
+import com.jkcredit.invoice.service.customer.CustomerOperService;
+import com.jkcredit.invoice.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("customerOperService")
+public class CustomerOperServiceImpl extends ServiceImpl<CustomerOperMapper,CustomerOper> implements CustomerOperService {
+    @Autowired
+    CustomerOperMapper customerOperMapper;
+    @Autowired
+    UserMapper userMapper;
+    @Override
+    public IPage findAllCustomerOper(Page page, CustomerOper customerOper) {
+        return customerOperMapper.selectAllByPage(page,customerOper);
+    }
+
+    @Override
+    public String saveCustomerOper(String customerName, int operType) {
+        //保存批次信息
+        User user = userMapper.getUserByUserName(customerName);
+        String batchNumber = "YD" + System.currentTimeMillis();
+        CustomerOper customerOper = new CustomerOper();
+        customerOper.setOperType(operType);
+        customerOper.setCompany(user.getCompany());
+        customerOper.setCreateTime(DateUtil.getCurrentDateStr());
+        customerOper.setBatchNumber(batchNumber);
+        customerOper.setCustomerPhone(user.getPhone());
+        customerOper.setCustomerName(customerName);
+        customerOperMapper.insert(customerOper);
+        return batchNumber;
+    }
+}

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

@@ -80,7 +80,7 @@ public class NoCarServiceImpl implements NoCarService{
         customerRecP.setCustomerName(customerCarRec2.getCustomerName());
         customerRecP.setCompanyName(customerCarRec2.getCompanyName());
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
-        if(customerRec == null){
+        if(customerRec == null || customerRec.getRecStatus()!=1){
             res.append("#客户："+customerCarRec2.getCustomerName()+"企业:"+customerCarRec2.getCompanyName()+"备案信息不存在");
             return new RespR(false,res.toString());
         }
@@ -231,15 +231,18 @@ public class NoCarServiceImpl implements NoCarService{
     public RespR noCarWaybillEnd(NoCarWayBill noCarWayBill) {
         //查询运单号为开始指令
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==1 ){
+            return new RespR(false,"当前运单状态无法结束");
+        }
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
+        noCarWayBill1.setBatchNumEnd(noCarWayBill.getBatchNumEnd());
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill.setBillwayStatus(4);
+            noCarWayBill1.setBillwayStatus(4);
+            noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
         }
-        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==1 ){
-            return new RespR(false,"当前运单状态无法结束");
-        }
+
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
         waybillEndRequest.setCompanyNum(noCarWayBill1.getCompanyNum());
         waybillEndRequest.setNum(noCarWayBill1.getBillNum());
@@ -249,12 +252,13 @@ public class NoCarServiceImpl implements NoCarService{
         if(waybillEndResponseRespR.getCode() == 1){
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
-            noCarWayBill.setBillwayStatus(2);
+            noCarWayBill1.setBillwayStatus(4);
+            noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
-        noCarWayBill1.setBillwayStatus(0);
-        noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
+        noCarWayBill1.setBillwayStatus(2);
+        noCarWayBill1.setUpdateTime(DateUtil.getCurrentDateStr());
         noCarWaybillMapper.updateByBillNum(noCarWayBill1);
         return new RespR();
     }
@@ -309,10 +313,11 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill.setBillwayStatus(4);
+            noCarWayBill1.setBillwayStatus(4);
+            noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
         }
-        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=-1 || noCarWayBill.getHisFlag() ==0 ){
+        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==0 ){
             return new RespR(false,"当前运单状态无法结束");
         }
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
@@ -325,6 +330,7 @@ public class NoCarServiceImpl implements NoCarService{
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
             noCarWayBill.setBillwayStatus(4);
+            noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());

src/main/java/com/jkcredit/invoice/service/nocar/NoCarBillWayService.java

@@ -29,5 +29,19 @@ public interface NoCarBillWayService {
      * @param noCarWayBills
      * @return
      */
-    RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills);
+    RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills,String customerName);
+
+    /**
+     * 批量结束运单数据
+     * @param noCarWayBills
+     * @return
+     */
+    RespR batchBillWayEnd(List<NoCarWayBill> noCarWayBills,String customerName);
+
+    /**
+     * 批量历史运单数据操作
+     * @param noCarWayBills
+     * @return
+     */
+    RespR batchHsitoryBillWay(List<NoCarWayBill> noCarWayBills,String customerName);
 }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -4,11 +4,21 @@ 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.CustomerCarRecMapper;
+import com.jkcredit.invoice.mapper.customer.CustomerMapper;
+import com.jkcredit.invoice.mapper.customer.CustomerOperMapper;
+import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
+import com.jkcredit.invoice.mapper.user.UserMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
+import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
+import com.jkcredit.invoice.model.entity.customer.CustomerOper;
+import com.jkcredit.invoice.model.entity.customer.CustomerRec;
+import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
+import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +36,12 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
     @Autowired
     NoCarService noCarService;
+
+    @Autowired
+    CustomerRecMapper customerRecMapper;
+
+    @Autowired
+    CustomerOperService customerOperService;
     @Override
     public IPage<List<NoCarWayBill>> findByPageAndWayBill(Page page, NoCarWayBill noCarWayBill) {
         return noCarWaybillMapper.selectAllByPage(page,noCarWayBill);
@@ -35,36 +51,128 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
     public IPage<List<NoCarWayBill>> findByPageAndWayBillException(Page page, NoCarWayBill noCarWayBill) {
         return noCarWaybillMapper.selectAllByPageException(page,noCarWayBill);
     }
-
     @Override
-    public RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills) {
+    public RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills,String customerName) {
         StringBuffer stringBuffer = new StringBuffer();
+        //保存批次号信息
+        String batchNumber = customerOperService.saveCustomerOper(customerName,1);
         noCarWayBills.parallelStream().forEach(noCarWayBill -> {
+            //根据税号，查询备案企业
+            CustomerRec customerRec = new CustomerRec();
+            customerRec.setCustomerName(customerName);
+            customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
+            customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+            if(customerRec == null){
+                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
+                return;
+            }
+            noCarWayBill.setCompanyName(customerRec.getCompanyName());
+            noCarWayBill.setCustomerName(customerName);
+            noCarWayBill.setBatchNum(batchNumber);
             //1.查询是否有车辆备案
             CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateColor());
 
             //2.无车车辆备案时进行车辆备案
             if(customerCarRec== null || customerCarRec.getRecStatus()!=1){
                 List<CustomerCarRec> customerCarRecs = new ArrayList<>();
+                customerCarRec = new CustomerCarRec();
+                customerCarRec.setCompanyName(noCarWayBill.getCompanyName());
+                customerCarRec.setCarNum(noCarWayBill.getPlateNum());
+                customerCarRec.setCarColor(noCarWayBill.getPlateColor());
+                customerCarRec.setCustomerName(customerName);
+                customerCarRec.setBusinessType("2");
                 customerCarRecs.add(customerCarRec);
                 RespR respR = noCarService.customerCarRec(customerCarRecs);
                 if(respR.getCode() ==1){
-                    return;
-                }else{
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    return;
                 }
             }
 
             //3.进行上传
+            RespR respR = noCarService.noCarWaybillStart(noCarWayBill);
+            if (respR.getCode() == 1){
+                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+            }
+        });
+        if(!StringUtils.isEmpty(stringBuffer.toString())){
+            return new RespR(false,stringBuffer.toString());
+        }
+        return new RespR(Boolean.TRUE);
+    }
+
+    @Override
+    public RespR batchHsitoryBillWay(List<NoCarWayBill> noCarWayBills, String customerName) {
+        StringBuffer stringBuffer = new StringBuffer();
+        //保存批次号信息
+        String batchNumber = customerOperService.saveCustomerOper(customerName,3);
+        noCarWayBills.parallelStream().forEach(noCarWayBill -> {
+            //根据税号，查询备案企业
+            CustomerRec customerRec = new CustomerRec();
+            customerRec.setCustomerName(customerName);
+            customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
+            customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+            if(customerRec == null || customerRec.getRecStatus()!=1){
+                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
+                return;
+            }
+            noCarWayBill.setCompanyName(customerRec.getCompanyName());
+            noCarWayBill.setCustomerName(customerName);
+            noCarWayBill.setBatchNum(batchNumber);
+            //1.查询是否有车辆备案
+            CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateColor());
+
+            //2.无车车辆备案时进行车辆备案
+            if(customerCarRec== null || customerCarRec.getRecStatus()!=1){
+                List<CustomerCarRec> customerCarRecs = new ArrayList<>();
+                customerCarRec = new CustomerCarRec();
+                customerCarRec.setCompanyName(noCarWayBill.getCompanyName());
+                customerCarRec.setCarNum(noCarWayBill.getPlateNum());
+                customerCarRec.setCarColor(noCarWayBill.getPlateColor());
+                customerCarRec.setCustomerName(customerName);
+                customerCarRec.setBusinessType("2");
+                customerCarRecs.add(customerCarRec);
+                RespR respR = noCarService.customerCarRec(customerCarRecs);
+                if(respR.getCode() ==1){
+                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    return;
+                }
+            }
+
+            //3.kais指令上传
             RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
             if (respR.getCode() == 1){
                 stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+            }else{
+                //3.kais指令上传
+                respR = noCarService.noCarHisWaybillEnd(noCarWayBill);
+                if(respR.getCode() == 1){
+                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                }
             }
+
         });
-        if(StringUtils.isEmpty(stringBuffer.toString())){
+        if(!StringUtils.isEmpty(stringBuffer.toString())){
             return new RespR(false,stringBuffer.toString());
         }
         return new RespR(Boolean.TRUE);
     }
 
+    @Override
+    public RespR batchBillWayEnd(List<NoCarWayBill> noCarWayBills, String customerName) {
+        StringBuffer stringBuffer = new StringBuffer();
+        //保存批次号信息
+        String batchNumber = customerOperService.saveCustomerOper(customerName,2);
+        noCarWayBills.parallelStream().forEach(noCarWayBill -> {
+            noCarWayBill.setBatchNumEnd(batchNumber);
+            RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
+            if (respR.getCode() == 1){
+                stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+            }
+        });
+        if(!StringUtils.isEmpty(stringBuffer.toString())){
+            return new RespR(false,stringBuffer.toString());
+        }
+        return new RespR(Boolean.TRUE);
+    }
 }

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

@@ -0,0 +1,51 @@
+<?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.CustomerOperMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.customer.CustomerOper">
+        <id column="id" property="id"/>
+        <result column="customerName" property="customerName"/>
+        <result column="customerPhone" property="customerPhone"/>
+        <result column="company" property="company"/>
+        <result column="createTime" property="createTime"/>
+        <result column="batchNumber" property="batchNumber"/>
+        <result column="operType" property="operType"/>
+    </resultMap>
+
+    <sql id="baseSql">
+        id,
+        customerName,
+        customerPhone,
+        company,
+        createTime,
+        batchNumber,
+        operType
+    </sql>
+    <select id="selectAllByPage" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_cusomerOper
+        <where>
+            <if test="customerOper.customerName != null and customerOper.customerName != ''">
+                AND  customerName LIKE CONCAT('%',#{customerOper.customerName},'%')
+            </if>
+            <if test="customerOper.operType != null and customerOper.operType != ''">
+                AND  operType = #{customerOper.operType}
+            </if>
+        </where>
+    </select>
+    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerOper" >
+        insert into t_cusomerOper (
+            customerName,
+            customerPhone,
+            company,
+            createTime,
+            batchNumber,
+            operType
+        )
+        values ( #{customerName,jdbcType=VARCHAR}, #{customerPhone,jdbcType=VARCHAR},
+            #{company,jdbcType=VARCHAR},#{createTime,jdbcType=VARCHAR}, #{batchNumber,jdbcType=INTEGER},
+            #{operType,jdbcType=INTEGER}
+        )
+    </insert>
+</mapper>

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

@@ -80,6 +80,12 @@
         from t_customer_rec
         where customerName = #{customerName,jdbcType=VARCHAR} AND company_name =  #{companyName,jdbcType=VARCHAR}
     </select>
+  <select id="selectByCustomerNameAndCompanyReference" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_rec
+    where customerName = #{customerName,jdbcType=VARCHAR} AND company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR}
+  </select>
   <select id="selectByCustomerNameAndCompanyConcat" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />,base64Str

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

@@ -59,6 +59,15 @@
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and billNum = #{noCarWayBill.billNum}
             </if>
+            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
+                and plateNum = #{noCarWayBill.plateNum}
+            </if>
+            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
+                and billwayStatus = #{noCarWayBill.billwayStatus}
+            </if>
+            <if test="noCarWayBill.hisFlag != null and noCarWayBill.hisFlag != ''">
+                and hisFlag = #{noCarWayBill.hisFlag}+1
+            </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and taxplayerCode = #{noCarWayBill.taxplayerCode}
             </if>
@@ -68,6 +77,12 @@
             <if test="noCarWayBill.endBegin != null and noCarWayBill.endBegin != ''">
                 and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
             </if>
+            <if test="noCarWayBill.batchNum != null and noCarWayBill.batchNum != ''">
+                and batchNumber = #{noCarWayBill.batchNum}
+            </if>
+            <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
+                and batchNumEnd = #{noCarWayBill.batchNumEnd}
+            </if>
         </where>
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
@@ -115,7 +130,7 @@
             companyAdress,
             companyBank,
             companyBankAcc,
-            companyTel,companyNum,updateTime
+            companyTel,companyNum,updateTime,batchNumber,batchNumEnd
         )
         values ( #{customerName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
         #{billNum,jdbcType=VARCHAR}, #{plateNum,jdbcType=VARCHAR}, #{plateColor,jdbcType=VARCHAR},
@@ -123,7 +138,7 @@
         #{predictEndTime,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER}, #{titleType,jdbcType=INTEGER},
         #{taxplayerCode,jdbcType=VARCHAR},#{intfaceStartTime,jdbcType=VARCHAR},#{interfaceEndTime,jdbcType=VARCHAR},
         #{billwayStatus,jdbcType=INTEGER},#{hisFlag,jdbcType=INTEGER}, #{companyAdress,jdbcType=VARCHAR}, #{companyBank,jdbcType=VARCHAR}
-        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR}
+        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},#{batchNum,jdbcType=VARCHAR},#{batchNumEnd,jdbcType=VARCHAR}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >