Przeglądaj źródła

feat:新增空车重车判断

wangweiyu 4 lat temu
rodzic
commit
1a37a9fa29

+ 4 - 0
src/main/java/com/aoyang/tms/entity/WorkCycle.java

@@ -121,6 +121,10 @@ public class WorkCycle implements Serializable {
     @TableField("escort_sign_url")
     private String escortSignUrl;
 
+    @ApiModelProperty(value = "当前净重")
+    @TableField("jing_weight")
+    private int jingWeight;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

+ 1 - 1
src/main/java/com/aoyang/tms/service/CommonService.java

@@ -25,7 +25,7 @@ public interface CommonService {
      * @Param  
      * @return 
     **/
-    int checkTruckZhong(Long truckId);
+    boolean checkTruckZhong(Long truckId);
 
 
     /**

+ 6 - 2
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -67,8 +67,12 @@ public class CommonServiceImpl implements CommonService {
     final static String BAIDUMAP_URL = "http://api.map.baidu.com/reverse_geocoding/v3/?output=json&coordtype=BD09&pois=1";
 
     @Override
-    public int checkTruckZhong(Long truckId) {
-        return 0;
+    public boolean checkTruckZhong(Long truckId) {
+        QueryWrapper<WorkCycle> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("truck_id", truckId);
+        queryWrapper.eq("status", 1);
+        WorkCycle cycle = workCycleService.getOne(queryWrapper);
+        return cycle == null ? false : cycle.getJingWeight() > 0;
     }
 
     @Override