后端修改

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -329,6 +329,16 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     }
                 }
 
+                //查询该车辆是否为内部车辆，内部车辆不允许批量注册司机和修改司机信息
+                HashMap<String, Object> findCar = new HashMap<>();
+                findCar.put("carNo", carNo);
+                findCar.put("validFlag", "0");
+                findCar.put("carTypeNo", "001004003");
+                List<MeterBaseCar> carModel = meterBaseCarMapper.selectByParameters(findCar);
+                if(carModel.size() >= 1) {
+                    rm.setMessage("内部车辆不允许批量注册司机和修改司机信息，请联系车辆管理部门");
+                    return rm;
+                }
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
                 for (MeterBaseDriver driver : driverList) {

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -862,7 +862,9 @@ throw new MarkerMetException(500, "操作异常！！");
             Date netTime = simpleFormat.parse(netTimeTemp);
 
             MeterWorkCarActual model = new MeterWorkCarActual();
-            model.setPredictionNo(map.get("predictionNo").toString());
+            if(map.get("predictionNo") != null) {
+                model.setPredictionNo(map.get("predictionNo").toString());
+            }
             model.setBaseSpot1No(map.get("baseSpot1No").toString());
             model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
             model.setGrossManNo(map.get("grossManNo").toString());

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

@@ -266,7 +266,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String no = PublicMethod.IdCreate(3);
             model.setActualFirstNo(no);
             model.setValueFlag("1");
-            model.setCreateTime(new Date());
+
+            if(model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
+                rm.setMessage("计量时间不能为空");
+                return rm;
+            }
             String userId = "";
             String userName = "";
             try{
@@ -279,7 +283,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
             model.setCreateManNo(userId);
             model.setCreateManName(userName);
-
             HashMap<String, Object> obj = new HashMap<>();
             obj.put("baseSpotNo", model.getBaseSpotNo());
             List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(obj);
@@ -305,7 +308,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
         }
         return rm;
-
     }
 
     @Override

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

@@ -104,6 +104,22 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "汽车衡洁净数据补录界面获取委托未过期的倒序列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/webLikeByDesc")
+    public RESTfulResult webLikeByDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<PreTrackScale> list = preTrackScaleService.webLikeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -17,6 +17,7 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
     List<PreTrackScale> selectlist(@Param( value = "carNo") String carNo);
 
     List<PreTrackScale> likeByDesc(Map<String, Object> var1);
+    List<PreTrackScale> webLikeByDesc(Map<String, Object> var1);
 
     List<PreTrackScale> selectuselist(@Param( value = "carNo") String carNo);
 

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3427,4 +3427,39 @@
     <include refid="whereLike"/>
     order By TRUST_DATE_TIME desc
   </select>
+
+  <select id="webLikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO like '%${carNo}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME like '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME like '%${receivingUintName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO = #{materialNo}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME like '%${materialName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO = #{meterTypeNo}
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      and value_flag in ('1')
+      and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+    order By TRUST_DATE_TIME desc
+  </select>
 </mapper>

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

@@ -26,6 +26,7 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
 
     List<PreTrackScale> selectlist(String carNo);
     PageList<PreTrackScale> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
+    PageList<PreTrackScale> webLikeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
 
     List<PreTrackScale> selectByCarNo(String carNo, String valueFlag);
 

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

@@ -129,6 +129,14 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         return pageInfo;
     }
 
+    @Override
+    public PageList<PreTrackScale> webLikeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<PreTrackScale> rows = preTrackScaleMapper.webLikeByDesc(parameters);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<PreTrackScale> selectView(HashMap param) {