Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents 7c3580d1 6e6d3fc9
Showing 4 changed files with 39 additions and 11 deletions
trash-ui/src/views/unit/carInfo/info.vue
trash-unit/src/main/java/com/trash/carInfo/controller/CarInfoController.java
trash-unit/src/main/java/com/trash/carInfo/domain/CarInfo.java
trash-unit/src/main/resources/mapper/unit/CarInfoMapper.xml
@@ -109,7 +109,11 @@
                 </el-select>
               </el-col>
               <el-col :span="19" v-if="volumeOrLWH==='体积'">
-                <el-input v-model="form.containerVolume" placeholder="请输入车辆体积" />
+                <el-select v-model="form.containerVolume" placeholder="请选择体积" style="width: 100%;">
+                  <el-option label="4" value="4"/>
+                  <el-option label="6" value="6" />
+                  <el-option label="8" value="8" />
+                </el-select>
               </el-col>
               <el-col :span="19" v-if="volumeOrLWH==='长宽高'">
                 <el-row>
@@ -683,6 +687,13 @@ export default {
               type: 'warning'
             });
           }
+          if(this.form.containerVolume!=null&&this.form.containerVolume!==""){
+            return this.$message({
+              message: '请选择车辆体积！',
+              type: 'warning'
+            });
+          }
+
           this.form.drivers = this.drivers.join(",");
           this.roadTransport.forEach(item => {
             if (item.raw != null) {
@@ -38,6 +38,7 @@ public class CarInfoController extends BaseController
     public TableDataInfo list(CarInfoVo carInfo)
     {
         startPage();
+        carInfo.setIsDel(1);
         List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
         return getDataTable(list);
     }
@@ -50,6 +51,7 @@ public class CarInfoController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CarInfoVo carInfo)
     {
+        carInfo.setIsDel(1);
         List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
         ExcelUtil<CarInfoVo> util = new ExcelUtil<CarInfoVo>(CarInfoVo.class);
         return util.exportExcel(list, "carInfo");
@@ -119,6 +119,16 @@ public class CarInfo extends BaseEntity
     @Excel(name = "二维码")
     private String qrCode;
  
+    private int isDel;
+
+    public int getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(int isDel) {
+        this.isDel = isDel;
+    }
+
     public String getLengthWidthHeight() {
         return lengthWidthHeight;
     }
@@ -35,6 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="updateBy"    column="update_by"    />
         <result property="creditStatus"    column="credit_status"    />
         <result property="qrCode"    column="qr_code"    />
+        <result property="isDel"    column="is_del"    />
     </resultMap>
  
     <resultMap type="CarInfoVo" id="CarInfoVoResult">
@@ -73,7 +74,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
  
     <sql id="selectCarInfoVo">
-        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by, credit_status, qr_code from car_info
+        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by, credit_status, qr_code，is_del from car_info
     </sql>
  
     <sql id="selectCarInfoForCompanyVo">
@@ -119,7 +120,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
     <select id="selectCarInfoList" parameterType="CarInfoVo" resultMap="CarInfoVoResult">
         <include refid="selectCarInfoForCompanyVo"/>
-        <where>  
+        <where>
             <if test="companyName != null   and companyName != ''"> and c.name like concat('%',#{companyName},'%')</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
             <if test="carCode != null  and carCode != ''"> and car_code like concat('%',#{carCode},'%')</if>
@@ -142,18 +143,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
             <if test="status != null "> and car.status = #{status}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and car.credit_status = #{creditStatus}</if>
+                <if test="isDel != null  and isDel != ''"> and car.is_del = #{isDel}</if>
         </where>
     </select>
  
     <select id="selectCarInfoById" parameterType="Long" resultMap="CarInfoResult">
         <include refid="selectCarInfoVo"/>
-        where id = #{id}
+        where id = #{id} and is_del = 1
     </select>
  
  
     <select id="selectByCompanyId" parameterType="Long" resultMap="CarInfoVoResult">
         <include refid="selectCarInfoForCompanyVo"/>
-        where car.company_id=#{companyId}
+        where car.company_id=#{companyId} and is_del = 1
     </select>
  
  
@@ -189,6 +191,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">credit_status,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="lengthWidthHeight != null">length_width_height,</if>
+            <if test="isDel != null">is_del,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
@@ -220,6 +223,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">#{creditStatus},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="lengthWidthHeight != null">#{lengthWidthHeight},</if>
+            <if test="isDel != null">#{isDel},</if>
          </trim>
     </insert>
  
@@ -255,20 +259,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">credit_status = #{creditStatus},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="lengthWidthHeight != null">length_width_height = #{lengthWidthHeight},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
         where id = #{id}
     </update>
  
-    <delete id="deleteCarInfoById" parameterType="Long">
-        delete from car_info where id = #{id}
-    </delete>
+    <update id="deleteCarInfoById" parameterType="Long">
+        update car_info set is_del = 0 where id = #{id}
+    </update>
  
-    <delete id="deleteCarInfoByIds" parameterType="String">
-        delete from car_info where id in 
+    <update id="deleteCarInfoByIds" parameterType="String">
+        update car_info set is_del = 0 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
  
  
     <insert id="addCarDriverRelation" parameterType="CarDriverRelation">