增加行驶里程数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java

@@ -157,7 +157,7 @@ public class BaseCarController extends BaseController
 
     @PostMapping("/PdaQueryCarList")
     @ResponseBody
-    public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar)
+    public AjaxResult PdaQueryCarList(BaseCar baseCar)
     {
         List<BaseCar> list = baseCarService.selectBaseCarList(baseCar);
         if (list == null || list.isEmpty()){

ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreInstall.java

@@ -47,6 +47,26 @@ public class RecordTyreInstall extends BaseEntity
     @Excel(name = "所在轮位")
     private String wheelPostion;
 
+    private String stageMileage;
+
+    private String recordId;
+
+    public String getStageMileage() {
+        return stageMileage;
+    }
+
+    public void setStageMileage(String stageMileage) {
+        this.stageMileage = stageMileage;
+    }
+
+    public String getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
+    }
+
     private String selfNo;
 
     public String getCompany() {

ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordTyreMileage.java

@@ -42,6 +42,17 @@ public class RecordTyreMileage extends BaseEntity
     @Excel(name = "花纹深度")
     private String patternDepth;
 
+    private String recordId;
+
+    public String getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
+    }
+
+
     public String getPatternDepth() {
         return patternDepth;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 轮胎安装记录Service业务层处理
@@ -137,9 +138,11 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService
     @Override
     public AjaxResult PdaUnInstallTyre(RecordTyreInstall recordTyreInstall) {
         try {
-            //插入安装记录表
+            //插入记录表
+            String recordId = UUID.randomUUID().toString();
             recordTyreInstall.setType("1");
             recordTyreInstall.setCreateTime(DateUtils.getNowDate());
+            recordTyreInstall.setRecordId(recordId);
             int n = recordTyreInstallMapper.insertRecordTyreInstall(recordTyreInstall);
             //更新轮胎基础信息表
             BaseTyre baseTyre = new BaseTyre();
@@ -169,6 +172,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService
             recordTyreMileage.setMileage(between);
             recordTyreMileage.setCreateTime(DateUtils.getNowDate());
             recordTyreMileage.setCreateBy(recordTyreInstall.getCreateBy());
+            recordTyreMileage.setRecordId(recordId);
             recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);
             if (n>0&&m>0){
                 return AjaxResult.success("卸胎成功！");

ruoyi-system/src/main/resources/mapper/tyre/RecordTyreInstallMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="patternDepth"    column="pattern_depth"    />
         <result property="company"    column="company"    />
         <result property="carTeam"    column="carTeam"    />
+        <result property="stageMileage"    column="stage_mileage"    />
     </resultMap>
 
     <sql id="selectRecordTyreInstallVo">
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRecordTyreInstallList" parameterType="RecordTyreInstall" resultMap="RecordTyreInstallResult">
         select rti.id, rti.tyre_rfid, rti.type, rti.mileage, su.user_name as create_by, rti.create_time,rti.update_by,rti.car_no,
         rti.wheel_postion,rti.update_time, rti.remark,rti.pattern_depth,bt.tyre_brand,bt.tyre_no,bt.self_no,bt.tyre_model,
-        sdss.dept_name as company,bt.team,sd.dept_name as carTeam
+        sdss.dept_name as company,bt.team,sd.dept_name as carTeam,rtm.mileage as stage_mileage
         from record_tyre_install rti
         LEFT JOIN base_tyre bt ON rti.tyre_rfid = bt.tyre_epc
         left join sys_user su ON  su.login_name = rti.create_by
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_dept sd ON bc.dept_id = sd.dept_id
         LEFT JOIN sys_dept sds ON sd.parent_id = sds.dept_id
         LEFT JOIN sys_dept sdss ON sds.parent_id = sdss.dept_id
+        LEFT JOIN record_tyre_mileage rtm ON rtm.record_id = rti.record_id
         where rti.id is not null
 
             <if test="tyreRfid != null  and tyreRfid != ''"> and rti.tyre_rfid = #{tyreRfid}</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="carNo != null  and carNo != ''">car_no,</if>
             <if test="wheelPostion != null  and wheelPostion != ''">wheel_postion,</if>
+            <if test="recordId != null  and recordId != ''">record_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null ">#{id},</if>
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="carNo != null  and carNo != ''">#{carNo},</if>
             <if test="wheelPostion != null  and wheelPostion != ''">#{wheelPostion},</if>
+            <if test="recordId != null  and recordId != ''">#{recordId},</if>
          </trim>
     </insert>
 

ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">update_time,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="patternDepth != null ">pattern_depth,</if>
+            <if test="recordId != null ">record_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null ">#{id},</if>
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null ">#{updateTime},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="patternDepth != null  and patternDepth != ''">#{patternDepth},</if>
+            <if test="recordId != null  and recordId != ''">#{recordId},</if>
          </trim>
     </insert>