refactor(ems): 优化故障记录模块功能和界面

- 添加备注字段并调整列名称
- 新增详情查看功能和右击菜单
- 优化表格样式和布局
- 添加数据导入功能- 调整 WebSocket URL
boardTest
zch 3 weeks ago
parent dbb761fc65
commit 6bc7940b24

@ -26,12 +26,12 @@ public class DailyFaultRecord extends BaseEntity
@Excel(name = "位置" , cellType = Excel.ColumnType.STRING)
private String location;
/** 当日值班长 */
@Excel(name = "当日值班长" , cellType = Excel.ColumnType.STRING)
/** 科室值班 */
@Excel(name = "科室值班" , cellType = Excel.ColumnType.STRING)
private String dailyDutySupervisor;
/** 天达当日值班长 */
@Excel(name = "天达当日值班长" , cellType = Excel.ColumnType.STRING)
/** 外包值班 */
@Excel(name = "外包值班" , cellType = Excel.ColumnType.STRING)
private String tendaDailyDutySupervisor;
/** 故障情况 */
@ -58,6 +58,10 @@ public class DailyFaultRecord extends BaseEntity
@Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC)
private Long handlingDuration;
/** 备注 */
@Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks;
public void setId(Long id)
{
this.id = id;
@ -157,6 +161,15 @@ public class DailyFaultRecord extends BaseEntity
{
return handlingDuration;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
@ -172,6 +185,7 @@ public class DailyFaultRecord extends BaseEntity
.append("faultOccurrenceTime", getFaultOccurrenceTime())
.append("handlingCompletionTime", getHandlingCompletionTime())
.append("handlingDuration", getHandlingDuration())
.append("remarks", getRemarks())
.toString();
}
}

@ -62,6 +62,10 @@ public class SparePartsUsageRecord extends BaseEntity
@Excel(name = "部门仓库", cellType = Excel.ColumnType.STRING)
private String departmentWarehouse;
/** 备注 */
@Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks;
public void setId(Long id)
{
this.id = id;
@ -170,6 +174,15 @@ public class SparePartsUsageRecord extends BaseEntity
{
return departmentWarehouse;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
@ -186,6 +199,7 @@ public class SparePartsUsageRecord extends BaseEntity
.append("warehouseManagerConfirmation", getWarehouseManagerConfirmation())
.append("inventoryStatus", getInventoryStatus())
.append("departmentWarehouse", getDepartmentWarehouse())
.append("remarks", getRemarks())
.toString();
}
}

@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="faultOccurrenceTime" column="fault_occurrence_time" />
<result property="handlingCompletionTime" column="handling_completion_time" />
<result property="handlingDuration" column="handling_duration" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectDailyFaultRecordVo">
select id, date, location, daily_duty_supervisor, tenda_daily_duty_supervisor, fault_situation, handling_measures, fault_type, fault_occurrence_time, handling_completion_time, handling_duration from daily_fault_record
select id, date, location, daily_duty_supervisor, tenda_daily_duty_supervisor, fault_situation, handling_measures, fault_type, fault_occurrence_time, handling_completion_time, handling_duration, remarks from daily_fault_record
</sql>
<select id="selectDailyFaultRecordList" parameterType="DailyFaultRecord" resultMap="DailyFaultRecordResult">
@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="faultOccurrenceTime != null and faultOccurrenceTime != ''"> and fault_occurrence_time like concat('%', #{faultOccurrenceTime}, '%')</if>
<if test="handlingCompletionTime != null and handlingCompletionTime != ''"> and handling_completion_time like concat('%', #{handlingCompletionTime}, '%')</if>
<if test="handlingDuration != null "> and handling_duration like concat('%', #{handlingDuration}, '%')</if>
<if test="remarks != null and remarks != ''"> and remarks like concat('%', #{remarks}, '%')</if>
</where>
</select>
@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="faultOccurrenceTime != null">fault_occurrence_time,</if>
<if test="handlingCompletionTime != null">handling_completion_time,</if>
handling_duration,
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="date != null">#{date},</if>
@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{handlingDuration},
</otherwise>
</choose>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{handlingDuration}
</otherwise>
</choose>,
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where id = #{id}
</update>

@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseManagerConfirmation" column="warehouse_manager_confirmation" />
<result property="inventoryStatus" column="inventory_status" />
<result property="departmentWarehouse" column="department_warehouse" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectSparePartsUsageRecordVo">
select id, date, spare_part_name, spare_part_model, quantity_used, remaining_quantity, issuing_warehouse, replacement_location, person_received, warehouse_manager_confirmation, inventory_status, department_warehouse from spare_parts_usage_record
select id, date, spare_part_name, spare_part_model, quantity_used, remaining_quantity, issuing_warehouse, replacement_location, person_received, warehouse_manager_confirmation, inventory_status, department_warehouse, remarks from spare_parts_usage_record
</sql>
<select id="selectSparePartsUsageRecordList" parameterType="SparePartsUsageRecord" resultMap="SparePartsUsageRecordResult">
@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseManagerConfirmation != null and warehouseManagerConfirmation != ''"> and warehouse_manager_confirmation like concat('%', #{warehouseManagerConfirmation}, '%')</if>
<if test="inventoryStatus != null and inventoryStatus != ''"> and inventory_status like concat('%', #{inventoryStatus}, '%')</if>
<if test="departmentWarehouse != null and departmentWarehouse != ''"> and department_warehouse like concat('%', #{departmentWarehouse}, '%')</if>
<if test="remarks != null and remarks != ''"> and remarks like concat('%', #{remarks}, '%')</if>
</where>
</select>
@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseManagerConfirmation != null">warehouse_manager_confirmation,</if>
<if test="inventoryStatus != null">inventory_status,</if>
<if test="departmentWarehouse != null">department_warehouse,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="date != null">#{date},</if>
@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseManagerConfirmation != null">#{warehouseManagerConfirmation},</if>
<if test="inventoryStatus != null">#{inventoryStatus},</if>
<if test="departmentWarehouse != null">#{departmentWarehouse},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseManagerConfirmation != null">warehouse_manager_confirmation = #{warehouseManagerConfirmation},</if>
<if test="inventoryStatus != null">inventory_status = #{inventoryStatus},</if>
<if test="departmentWarehouse != null">department_warehouse = #{departmentWarehouse},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where id = #{id}
</update>

Loading…
Cancel
Save