问题修改

src/main/java/com/model/controller/DispatchController.java

@@ -7,9 +7,6 @@ import com.model.util.PassToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * @program: model

src/main/java/com/model/controller/UserController.java

@@ -11,7 +11,6 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("user")
-@PassToken
 public class UserController {
 
     @Autowired

src/main/java/com/model/entity/Dispatch.java

@@ -36,6 +36,10 @@ public class Dispatch implements Serializable {
      * 预计送达时间
      */
     private String arrivalTime;
+    /**
+     * 预计送达时间
+     */
+    private String arrivalTimes;
     /**
      * 0正常1异常
      */
@@ -56,7 +60,10 @@ public class Dispatch implements Serializable {
      * 实际到达时间
      */
     private String finalTime;
-
+    /**
+     * 实际到达时间
+     */
+    private String finalTimes;
     /**
      * 子表信息
      */
@@ -73,4 +80,12 @@ public class Dispatch implements Serializable {
      * 数量
      */
     private String qty;
+    /**
+     * 页数
+     */
+    private int page;
+    /**
+     * 条数
+     */
+    private int limit;
 }

src/main/java/com/model/mapper/ClientMapper.java

@@ -14,4 +14,8 @@ import java.util.List;
 @Mapper
 public interface ClientMapper {
     Client getClient(Client client);
+
+    void addClient(Client client);
+
+    void updClient(Client client);
 }

src/main/java/com/model/service/impl/DispatchServiceImpl.java

@@ -1,17 +1,20 @@
 package com.model.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.model.entity.Client;
 import com.model.entity.Dispatch;
 import com.model.entity.DispatchSublist;
+import com.model.mapper.ClientMapper;
 import com.model.mapper.DispatchMapper;
 import com.model.result.CommRes;
+import com.model.service.ClientService;
 import com.model.service.DispatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @program: model
@@ -24,6 +27,9 @@ public class DispatchServiceImpl implements DispatchService {
     @Autowired
     private DispatchMapper dispatchMapper;
 
+    @Autowired
+    private ClientMapper clientMapper;
+
 
 
     /**
@@ -58,6 +64,32 @@ public class DispatchServiceImpl implements DispatchService {
     public CommRes updDispatch(Dispatch dispatch) {
         try {
             dispatchMapper.updDispatch(dispatch);
+
+            //添加收货的时间/时长
+            Dispatch dispatch1 = dispatchMapper.getDispatch(dispatch);
+
+            SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
+            Date star   = dft.parse(dispatch1.getScrq());//开始时间
+            Date endDay = dft.parse(dispatch1.getFinalTime());//结束时间
+            Long starTime=star.getTime();
+            Long endTime=endDay.getTime();
+            Long num=endTime-starTime;//时间戳相差的毫秒数
+            String nums = String.valueOf(num/24/60/60/1000);
+            System.out.println("相差天数为："+nums);//除以一天的毫秒数
+
+            //改变时间
+            Client client = new Client();
+            client.setCode(dispatch1.getCustomer());
+            client.setDays(nums);
+            Client client1 = clientMapper.getClient(client);
+
+            if (client1 == null){
+                //添加
+                clientMapper.addClient(client);
+            }else {
+                //修改
+                clientMapper.updClient(client);
+            }
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -73,18 +105,18 @@ public class DispatchServiceImpl implements DispatchService {
      */
     @Override
     public CommRes getDispatchList(Dispatch dispatch) {
-        LinkedList<Dispatch> linkedList = new LinkedList<>();
+        PageInfo<Dispatch> pageInfo = null ;
         try {
-            List<Dispatch> list = dispatchMapper.getDispatchList(dispatch);
-            for (Dispatch dispatch1 : list) {
+            PageHelper.startPage(dispatch.getPage(), dispatch.getLimit());
+            pageInfo = new PageInfo<>(dispatchMapper.getDispatchList(dispatch));
+            for (Dispatch dispatch1 : pageInfo.getList()) {
                 List<DispatchSublist> list1 = dispatchMapper.getDispatchLists(dispatch1);
                 dispatch1.setDataList(list1);
-                linkedList.add(dispatch1);
             }
         }catch (Exception e){
             e.printStackTrace();
         }
-        return CommRes.success(linkedList);
+        return CommRes.success(pageInfo);
     }
 
 }

src/main/resources/mapper/ClientMapper.xml

@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.model.mapper.ClientMapper">
+    <!--添加-->
+    <insert id="addClient">
+        insert into sg_client(code,days) values(#{code},#{days})
+    </insert>
+    <!--修改-->
+    <update id="updClient">
+        update sg_client set days = #{days} where code = #{code}
+    </update>
 
     <!--根据客户编号查询天数-->
     <select id="getClient" resultType="com.model.entity.Client">

src/main/resources/mapper/DispatchMapper.xml

@@ -23,7 +23,17 @@
     </update>
     <!--查询是否有重复数据-->
     <select id="getDispatch" resultType="com.model.entity.Dispatch">
-        select id,truck_no,customer,scrq from sg_dispatch where truck_no = #{truckNo} and customer = #{customer}
+        select id,
+               truck_no,
+               customer,
+               scrq,
+               arrival_time,
+               anomaly,
+               note,
+               imgs,
+               final_time,
+               uuid
+        from sg_dispatch where truck_no = #{truckNo} and customer = #{customer}
     </select>
     <!--查询父表信息-->
     <select id="getDispatchList" resultType="com.model.entity.Dispatch">
@@ -41,10 +51,16 @@
         from sg_dispatch
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="arrivalTime != null and arrivalTime != ''">
-                and arrival_time like CONCAT(CONCAT('%', #{arrivalTime}), '%')
+                and arrival_time <![CDATA[>=]]> #{arrivalTime}
+            </if>
+            <if test="arrivalTimes != null and arrivalTimes != ''">
+                and arrival_time <![CDATA[<=]]> #{arrivalTimes}
             </if>
             <if test="finalTime != null and finalTime != ''">
-                and final_time like CONCAT(CONCAT('%', #{finalTime}), '%')
+                and final_time <![CDATA[>=]]> #{finalTime}
+            </if>
+            <if test="finalTimes != null and finalTimes != ''">
+                and final_time <![CDATA[<=]]> #{finalTimes}
             </if>
             <if test="customer != null and customer != ''">
                 and customer = #{customer}