wuxw
2020-01-28 829d8fc8970929370945be167288bcb13eddbea7
翻译黑白名单
4个文件已修改
30 ■■■■ 已修改文件
WebService/src/main/resources/components/carBlackWhitePackage/carBlackWhite-manage/carBlackWhiteManage.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarBlackWhiteDto.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/vo/api/carBlackWhite/ApiCarBlackWhiteDataVo.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/hardwareAdapation/CarBlackWhiteServiceDaoImplMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/carBlackWhitePackage/carBlackWhite-manage/carBlackWhiteManage.html
@@ -73,7 +73,7 @@
                        <tbody>
                        <tr v-for="carBlackWhite in carBlackWhiteManageInfo.carBlackWhites">
                            <td class="text-center">{{carBlackWhite.bwId}}</td>
                            <td class="text-center">{{carBlackWhite.blackWhite}}</td>
                            <td class="text-center">{{carBlackWhite.blackWhiteName}}</td>
                            <td class="text-center">{{carBlackWhite.carNum}}</td>
                            <td class="text-center">{{carBlackWhite.startTime}}</td>
                            <td class="text-center">{{carBlackWhite.endTime}}</td>
java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarBlackWhiteDto.java
@@ -16,6 +16,7 @@
public class CarBlackWhiteDto extends PageDto implements Serializable {
    private String blackWhite;
    private String blackWhiteName;
    private String carNum;
    private String startTime;
    private String endTime;
@@ -92,4 +93,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
    public String getBlackWhiteName() {
        return blackWhiteName;
    }
    public void setBlackWhiteName(String blackWhiteName) {
        this.blackWhiteName = blackWhiteName;
    }
}
java110-bean/src/main/java/com/java110/vo/api/carBlackWhite/ApiCarBlackWhiteDataVo.java
@@ -7,6 +7,7 @@
    private String bwId;
    private String blackWhite;
    private String blackWhiteName;
    private String carNum;
    private String startTime;
    private String endTime;
@@ -51,5 +52,11 @@
        this.endTime = endTime;
    }
    public String getBlackWhiteName() {
        return blackWhiteName;
    }
    public void setBlackWhiteName(String blackWhiteName) {
        this.blackWhiteName = blackWhiteName;
    }
}
java110-db/src/main/resources/mapper/hardwareAdapation/CarBlackWhiteServiceDaoImplMapper.xml
@@ -85,9 +85,12 @@
    <select id="getCarBlackWhiteInfo" parameterType="Map" resultType="Map">
        select t.black_white,t.black_white blackWhite,t.car_num,t.car_num carNum,t.start_time,t.start_time
        startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
        communityId,t.b_id,t.b_id bId,t.bw_id,t.bw_id bwId
        from car_black_white t
        communityId,t.b_id,t.b_id bId,t.bw_id,t.bw_id bwId,td1.name blackWhiteName
        from car_black_white t,t_dict td1
        where 1 =1
        and t.black_white = td1.status_cd
        and td1.table_name = 'car_black_white'
        and td1.table_columns = 'black_white'
        <if test="blackWhite !=null and blackWhite != ''">
            and t.black_white= #{blackWhite}
        </if>
@@ -154,8 +157,11 @@
    <!-- 查询黑白名单数量 add by wuxw 2018-07-03 -->
    <select id="queryCarBlackWhitesCount" parameterType="Map" resultType="Map">
        select count(1) count
        from car_black_white t
        from car_black_white t,t_dict td1
        where 1 =1
        and t.black_white = td1.status_cd
        and td1.table_name = 'car_black_white'
        and td1.table_columns = 'black_white'
        <if test="blackWhite !=null and blackWhite != ''">
            and t.black_white= #{blackWhite}
        </if>