后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3470,6 +3470,9 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
     <if test="flag != null and flag != ''">
       and value_flag != '0'
     </if>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2849,7 +2849,7 @@
     order by create_time desc
   </select>
 
-  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+  <select id="ApplikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
     <if test="flag != null and flag != ''">

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -3699,7 +3699,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
 
 
-            rm.setData(afl + no1);
+            rm.setData(secondDb.getActualFirstNo());
             rm.setMessage(flag);
             return rm;
         }
@@ -3765,16 +3765,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         PageHelper.startPage(pageNum, pageSize);
         List<MeterWorkCarActualFirst> rows = meterWorkCarActualFirstMapper.likeByDesc(params);
         //移除所有期限皮数据
-
-        for(int i = 0; i < rows.size(); i++){
-            if(rows.get(0).getWeightType().equals("2")) {
-                rows.remove(i);
+        if(rows.size() >= 1) {
+            for(int i = 0; i < rows.size(); i++){
+                if(rows.get(0).getWeightType().equals("2")) {
+                    rows.remove(i);
+                }
+            }
+            params.put("weightType", "2");
+            List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.likeByDesc(params);
+            if(firstList.size() >= 1) {
+                rows.add(firstList.get(0));
             }
-        }
-        params.put("weightType", "2");
-        List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.likeByDesc(params);
-        rows.add(firstList.get(0));
-
         /*Collections.sort(rows, new Comparator<MeterWorkCarActualFirst>() {
             @Override
             public int compare(MeterWorkCarActualFirst o1, MeterWorkCarActualFirst o2) {
@@ -3783,7 +3784,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //上面使用的是降序排序，如果正序 直接使用o1-o2即可
             }
         });*/
-
+        }
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
@@ -4191,7 +4192,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             rm.setSucceed();
             rm.setCode("200");
             rm.setMessage("操作成功！！");
-            rm.setData("操作成功");
+            rm.setData(grossModel.getActualFirstNo());
             return rm;
         } catch (Exception e) {
             e.printStackTrace();