后端修改

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -1801,7 +1801,6 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         select '新系统' remark,
         matter_no,
         matter_name,
-        sender_remark,
         count(1) countSum,
         sum(gross_weight) gross_weight,
         sum(tare_weight) tare_weight,
@@ -1841,12 +1840,11 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         <if test="remark != null and remark != ''">
             and '新系统' like '%${remark}%'
         </if>
-        group by matter_no,matter_name,sender_remark,forwarding_unit_name,receiving_uint_name
+        group by matter_no,matter_name,forwarding_unit_name,receiving_uint_name
         union
         select '新系统' remark,
         matter_no,
         matter_name,
-        sender_remark,
         count(1) countSum,
         sum(gross_weight) grossWeight,
         sum(tare_weight) tareWeight,
@@ -1886,7 +1884,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         <if test="remark != null and remark != ''">
             and '新系统' like '%${remark}%'
         </if>
-        group by matter_no,matter_name,sender_remark, forwarding_unit_name, receiving_uint_name
+        group by matter_no,matter_name, forwarding_unit_name, receiving_uint_name
         )
     </select>
 
@@ -1894,7 +1892,6 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         select '老系统' remark,
         wlbm matter_no,
         wlmc matter_name,
-        hy sender_remark,
         count(1) countSum,
         sum(mz*1000) gross_weight,
         sum(pz*1000) tare_weight,
@@ -1933,6 +1930,6 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         <if test="remark != null and remark != ''">
             and '老系统' like '%${remark}%'
         </if>
-        group by wlbm, wlmc, hy, fhdw, shdw
+        group by wlbm, wlmc, fhdw, shdw
     </select>
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -74,7 +74,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
     @GetMapping(value = "/findCarScale")
     public RESTfulResult findCarScale(@RequestParam HashMap params) {
         try {
-            PreTrackScale list = preTrackScaleService.findCarScale(params);
+            PageList<PreTrackScale> list = preTrackScaleService.findCarScale(params);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -60,5 +60,5 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
     List<PreTrackScale> selectInUseAndNoUse(HashMap<String, Object> model);
 
     //根据委托编号查询委托信息，委托编号参数和查询的委托信息为空返回空
-    PreTrackScale findCarScale(HashMap model);
+    PageList<PreTrackScale> findCarScale(HashMap model);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -364,13 +364,14 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
     }
 
     @Override
-    public PreTrackScale findCarScale(HashMap param) {
+    public PageList<PreTrackScale> findCarScale(HashMap param) {
         String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
         if(StringUtils.isEmpty(predictionNo)) {
             return null;
         }
-        PreTrackScale list = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
-        return list;
+        List<PreTrackScale> list = preTrackScaleMapper.selectByParameters(param);
+        PageList pageInfo = new PageList(list);
+        return pageInfo;
     }
 
     @Override