后端代码提交

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -341,11 +342,10 @@ public class NoCarController {
             }else if("3".equals(fileName)){
                 fileName = "历史运单模板.xlsx";
             }
-            String path = this.getClass().getClassLoader().getResource("").getPath();
             OutputStream outputStream = null;
             InputStream inputStream = null;
             try {
-                File file = new File(path+"static/templates/excel/"+fileName);
+                File file = ResourceUtils.getFile("classpath:static/templates/excel/"+fileName);
                 inputStream = new FileInputStream(file);
                 response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(fileName, "UTF-8"));
                 outputStream = response.getOutputStream();

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

@@ -7,7 +7,7 @@ import java.util.Date;
 /**
  * 无车实体类
  */
-public class NoCarWayBill {
+public class NoCarWayBill implements Cloneable{
     /**
      * id
      */
@@ -419,4 +419,9 @@ public class NoCarWayBill {
     public void setActEndTimeDate(Date actEndTimeDate) {
         this.actEndTimeDate = actEndTimeDate;
     }
+
+    @Override
+    public NoCarWayBill clone() throws CloneNotSupportedException {
+        return (NoCarWayBill)super.clone();
+    }
 }

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

@@ -341,9 +341,9 @@ public class NoCarServiceImpl implements NoCarService{
         waybillStartRequest.setNum(noCarWayBill.getBillNum());
         waybillStartRequest.setPlateNum(noCarWayBill.getPlateNum());
         waybillStartRequest.setPlateColor(Integer.parseInt(noCarWayBill.getPlateColor()));
-        waybillStartRequest.setStartTime(DateUtil.tTimeToDate(noCarWayBill.getStartTime()));
+        waybillStartRequest.setStartTime(DateUtil.dateFormate(noCarWayBill.getStartTime()));
         waybillStartRequest.setSourceAddr(noCarWayBill.getSourceAddr());
-        waybillStartRequest.setPredictEndTime(noCarWayBill.getPredictEndTime());
+        waybillStartRequest.setPredictEndTime(DateUtil.dateFormate(noCarWayBill.getPredictEndTime()));
         waybillStartRequest.setFee(noCarWayBill.getFee());
         waybillStartRequest.setTitleType(noCarWayBill.getTitleType());
         waybillStartRequest.setTaxplayerCode(noCarWayBill.getTaxplayerCode());

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

@@ -4,14 +4,9 @@ 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;
@@ -102,7 +97,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
     }
 
     @Override
-    public RespR batchHsitoryBillWay(List<NoCarWayBill> noCarWayBills, String customerName) {
+    public RespR batchHsitoryBillWay(List<NoCarWayBill> noCarWayBills, String customerName){
         StringBuffer stringBuffer = new StringBuffer();
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,3);
@@ -140,12 +135,20 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
             }
 
             //3.kais指令上传
+            NoCarWayBill noCarWayBillClo = null;
+            try{
+                noCarWayBillClo = noCarWayBill.clone();
+            }catch (Exception e){
+               e.printStackTrace();
+                noCarWayBillClo = noCarWayBill;
+            }
+
             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);
+                respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo);
                 if(respR.getCode() == 1){
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                 }else{