修改

huaxin-system/src/main/resources/mapper/system/TDevLifeCycleMapper.xml

@@ -59,19 +59,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by id desc
     </select>
     <select id="selectTDevLifeCycleListByParam" parameterType="TDevLifeCycle" resultMap="TDevLifeCycleResult">
-        SELECT id, dev_type,
-        (SELECT dict_label FROM sys_dict_data WHERE dict_type='cytle_dev_type' AND dict_value=dev_type) dev_type_name,
-        dev_name, dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date,
-        curr_overhaul_date,dev_void_date,
-        next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time,
+        SELECT
+        id,
+        dev_type,
+        (SELECT dict_label FROM sys_dict_data WHERE dict_type='cytle_dev_type' AND dict_value=t.dev_type) AS dev_type_name,
+        dev_name,
+        dev_no,
+        dev_addr,
+        dev_describe,
+        dev_company,
+        dev_status,
+        alarm_days,
+        use_date,
+        curr_overhaul_date,
+        dev_void_date,
+        next_overhaul_date,
+        curr_maintenance_date,
+        next_maintenance_date,
+        create_time,
+        jianxiu
+        FROM (
+        SELECT
+        *,
         CASE
         WHEN curr_overhaul_date IS NULL THEN -1
-        WHEN next_overhaul_date IS NULL OR DATEDIFF(next_overhaul_date, NOW()) > alarm_days  THEN 0
-        WHEN next_overhaul_date>NOW()   THEN 1
+        WHEN next_overhaul_date IS NULL OR DATEDIFF(next_overhaul_date, NOW()) > alarm_days THEN 0
+        WHEN next_overhaul_date > NOW() THEN 1
         ELSE 2
         END AS jianxiu
-
         FROM t_dev_life_cycle
+        ) t
         <where>
             <if test="devType != null  and devType != ''"> and dev_type = #{devType}</if>
             <if test="devName != null  and devName != ''"> and dev_name like concat('%', #{devName}, '%')</if>

huaxin-web/src/views/cycle/inspect.vue

@@ -11,19 +11,19 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="出厂编号" prop="devName">
+      <el-form-item label="设备名称" prop="devName">
         <el-input
           v-model="queryParams.devName"
-          placeholder="请输入出厂编号"
+          placeholder="请输入设备名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规格型号" prop="devNo">
+      <el-form-item label="出厂编号" prop="devNo">
         <el-input
           v-model="queryParams.devNo"
-          placeholder="请输入规格型号"
+          placeholder="请输入出厂编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -70,8 +70,8 @@
 
     <el-table v-loading="loading" :data="cycleList" @selection-change="handleSelectionChange">
       <el-table-column label="设备类型" align="center" prop="devTypeName" width="120"/>
-      <el-table-column label="出厂编号" align="center" prop="devName" />
-      <el-table-column label="规格型号" align="center" prop="devNo" />
+      <el-table-column label="设备名称" align="center" prop="devName" />
+      <el-table-column label="出厂编号" align="center" prop="devNo" />
       <el-table-column label="设备位置" align="center" prop="devAddr" >
         <template slot-scope="scope">
           <span v-if="scope.row.devAddr==null">-</span>