Skip to content

H
huaxin-rq
Commit 77530bdc authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

设备生命周期添加字段

parent e8c76483
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 8 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TDevLifeCycle.java
View file @ 77530bdc
...@@ -93,6 +93,11 @@ public class TDevLifeCycle extends BaseEntity ...@@ -93,6 +93,11 @@ public class TDevLifeCycle extends BaseEntity
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date devDate; private Date devDate;
/** "报废日期" */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date devVoidDate;
/** 制造单位 */ /** 制造单位 */
@Excel(name = "制造单位") @Excel(name = "制造单位")
private String devCompany; private String devCompany;
...@@ -107,7 +112,7 @@ public class TDevLifeCycle extends BaseEntity ...@@ -107,7 +112,7 @@ public class TDevLifeCycle extends BaseEntity
/** 启用日期 */ /** 启用日期 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "投运日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date useDate; private Date useDate;
/** 最新检修日期 */ /** 最新检修日期 */
...@@ -130,6 +135,15 @@ public class TDevLifeCycle extends BaseEntity ...@@ -130,6 +135,15 @@ public class TDevLifeCycle extends BaseEntity
private String soutext; private String soutext;
public Date getDevVoidDate() {
return devVoidDate;
}
public void setDevVoidDate(Date devVoidDate) {
this.devVoidDate = devVoidDate;
}
public String getSoutext() { public String getSoutext() {
return soutext; return soutext;
} }
......
huaxin-system/src/main/resources/mapper/system/TDevLifeCycleMapper.xml
View file @ 77530bdc
...@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="workElectricity" column="work_electricity" /> <result property="workElectricity" column="work_electricity" />
<result property="devNumber" column="dev_number" /> <result property="devNumber" column="dev_number" />
<result property="devDate" column="dev_date" /> <result property="devDate" column="dev_date" />
<result property="devVoidDate" column="dev_void_date" />
<result property="devStatus" column="dev_status" /> <result property="devStatus" column="dev_status" />
<result property="alarmDays" column="alarm_days" /> <result property="alarmDays" column="alarm_days" />
<result property="useDate" column="use_date" /> <result property="useDate" column="use_date" />
...@@ -33,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTDevLifeCycleVo"> <sql id="selectTDevLifeCycleVo">
select id, dev_type, dev_name, dev_no, dev_addr, dev_company, dev_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date, dev_describe, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle select id, dev_type, dev_name, dev_no, dev_addr, dev_company, dev_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date, dev_void_date,dev_describe, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle
</sql> </sql>
<select id="selectTDevLifeCycleList" parameterType="TDevLifeCycle" resultMap="TDevLifeCycleResult"> <select id="selectTDevLifeCycleList" 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, 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_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date, dev_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date,dev_void_date,
dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle
<where> <where>
<if test="devType != null and devType != ''"> and dev_type = #{devType}</if> <if test="devType != null and devType != ''"> and dev_type = #{devType}</if>
...@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by id desc order by id desc
</select> </select>
<select id="selectTDevLifeCycleListByParam" parameterType="TDevLifeCycle" resultMap="TDevLifeCycleResult"> <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, 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,case when (TO_DAYS(next_overhaul_date)-TO_DAYS(NOW()))>alarm_days then 0 when next_overhaul_date is null or alarm_days is null then 0 else 1 end as jianxiu from t_dev_life_cycle next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time,case when (TO_DAYS(next_overhaul_date)-TO_DAYS(NOW()))>alarm_days then 0 when next_overhaul_date is null or alarm_days is null then 0 else 1 end as jianxiu from t_dev_life_cycle
<where> <where>
<if test="devType != null and devType != ''"> and dev_type = #{devType}</if> <if test="devType != null and devType != ''"> and dev_type = #{devType}</if>
...@@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workElectricity != null">work_electricity,</if> <if test="workElectricity != null">work_electricity,</if>
<if test="devNumber != null">dev_number,</if> <if test="devNumber != null">dev_number,</if>
<if test="devDate != null">dev_date,</if> <if test="devDate != null">dev_date,</if>
<if test="devVoidDate != null">dev_void_date,</if>
<if test="devCompany != null">dev_company,</if> <if test="devCompany != null">dev_company,</if>
<if test="devStatus != null">dev_status,</if> <if test="devStatus != null">dev_status,</if>
<if test="alarmDays != null">alarm_days,</if> <if test="alarmDays != null">alarm_days,</if>
...@@ -126,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -126,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workElectricity != null">#{workElectricity},</if> <if test="workElectricity != null">#{workElectricity},</if>
<if test="devNumber != null">#{devNumber},</if> <if test="devNumber != null">#{devNumber},</if>
<if test="devDate != null">#{devDate},</if> <if test="devDate != null">#{devDate},</if>
<if test="devVoidDate != null">#{devVoidDate},</if>
<if test="devCompany != null">#{devCompany},</if> <if test="devCompany != null">#{devCompany},</if>
<if test="devStatus != null">#{devStatus},</if> <if test="devStatus != null">#{devStatus},</if>
<if test="alarmDays != null">#{alarmDays},</if> <if test="alarmDays != null">#{alarmDays},</if>
...@@ -155,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -155,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workElectricity != null">work_electricity = #{workElectricity},</if> <if test="workElectricity != null">work_electricity = #{workElectricity},</if>
<if test="devNumber != null">dev_number = #{devNumber},</if> <if test="devNumber != null">dev_number = #{devNumber},</if>
<if test="devDate != null">dev_date = #{devDate},</if> <if test="devDate != null">dev_date = #{devDate},</if>
<if test="devVoidDate != null">dev_void_date = #{devVoidDate},</if>
<if test="devStatus != null">dev_status = #{devStatus},</if> <if test="devStatus != null">dev_status = #{devStatus},</if>
<if test="alarmDays != null">alarm_days = #{alarmDays},</if> <if test="alarmDays != null">alarm_days = #{alarmDays},</if>
<if test="useDate != null">use_date = #{useDate},</if> <if test="useDate != null">use_date = #{useDate},</if>
......
huaxin-web/src/views/cycle/components/CycleDetailInfo.vue
View file @ 77530bdc
...@@ -243,6 +243,21 @@ ...@@ -243,6 +243,21 @@
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="生产日期">
<span v-if="form.devDate">{{ form.devDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废日期">
<span v-if="form.devVoidDate">{{ form.devVoidDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
......
huaxin-web/src/views/cycle/index.vue
View file @ 77530bdc
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<span v-else>{{ scope.row.alarmDays }}</span> <span v-else>{{ scope.row.alarmDays }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备启用日期" align="center" prop="useDate" width="100"> <el-table-column label="设备投运日期" align="center" prop="useDate" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.useDate==null">-</span> <span v-if="scope.row.useDate==null">-</span>
<span v-else>{{ parseTime(scope.row.useDate, '{y}-{m}-{d}') }}</span> <span v-else>{{ parseTime(scope.row.useDate, '{y}-{m}-{d}') }}</span>
...@@ -427,13 +427,36 @@ ...@@ -427,13 +427,36 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="启用日期" prop="useDate"> <el-form-item label="投运日期" prop="useDate">
<el-date-picker clearable size="small" <el-date-picker clearable size="small"
v-model="form.useDate" v-model="form.useDate"
type="date" type="date"
style="width: 100%" style="width: 100%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择启用日期"> placeholder="选择投运日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<el-date-picker clearable size="small"
v-model="form.devDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择生产日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废日期" prop="devVoidDate">
<el-date-picker clearable size="small"
v-model="form.devVoidDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择报废日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment