优化车辆在场状态显示

WebService/src/main/resources/components/carInoutPackage/carIn-manage/carInManage.html

@@ -76,7 +76,7 @@
                         <tbody>
                         <tr v-for="carIn in carInManageInfo.carIns">
                             <td class="text-center">{{carIn.inoutId}}</td>
-                            <td class="text-center">{{carIn.state}}</td>
+                            <td class="text-center">{{carIn.stateName}}</td>
                             <td class="text-center">{{carIn.carNum}}</td>
                             <td class="text-center">{{carIn.inTime}}</td>
                             <td class="text-center">{{carIn.inHours}}小时{{carIn.inMin}}分</td>

WebService/src/main/resources/components/carInoutPackage/carInout-manage/carInoutManage.html

@@ -82,7 +82,7 @@
                         <tbody>
                         <tr v-for="carInout in carInoutManageInfo.carInouts">
                             <td class="text-center">{{carInout.inoutId}}</td>
-                            <td class="text-center">{{carInout.state}}</td>
+                            <td class="text-center">{{carInout.stateName}}</td>
                             <td class="text-center">{{carInout.carNum}}</td>
                             <td class="text-center">{{carInout.inTime}}</td>
                             <td class="text-center">{{carInout.outTime}}</td>

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java

@@ -22,6 +22,7 @@ public class CarInoutDto extends PageDto implements Serializable {
     private String inoutId;
     private String carNum;
     private String state;
+    private String stateName;
     private String[] states;
     private String communityId;
     private String outTime;
@@ -105,4 +106,12 @@ public class CarInoutDto extends PageDto implements Serializable {
     public void setOutTime(String outTime) {
         this.outTime = outTime;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java

@@ -7,6 +7,7 @@ public class ApiCarInoutDataVo implements Serializable {
 
     private String inoutId;
     private String state;
+    private String stateName;
     private String carNum;
     private String inTime;
     private String outTime;
@@ -77,4 +78,12 @@ public class ApiCarInoutDataVo implements Serializable {
     public void setInMin(int inMin) {
         this.inMin = inMin;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/hardwareAdapation/CarInoutServiceDaoImplMapper.xml

@@ -84,9 +84,12 @@
     <select id="getCarInoutInfo" parameterType="Map" resultType="Map">
         select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.car_num,t.car_num
         carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
-        bId,t.out_time,t.out_time outTime
-        from car_inout t
+        bId,t.out_time,t.out_time outTime,td1.name stateName
+        from car_inout t,t_dict td1
         where 1 =1
+        and t.state = td1.status_cd
+        and a.table_name = 'car_inout'
+        and a.table_columns = 'state'
         <if test="inTime !=null ">
             and t.in_time= #{inTime}
         </if>
@@ -160,7 +163,11 @@
     <select id="queryCarInoutsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from car_inout t
+        from car_inout t,t_dict td1
         where 1 =1
+        and t.state = td1.status_cd
+        and a.table_name = 'car_inout'
+        and a.table_columns = 'state'
         <if test="inTime !=null ">
             and t.in_time= #{inTime}
         </if>