feat(eqp): add production line and inspect part query, enhance daily check statistics
1. 新增巡检记录BO和VO的产线、巡检部位字段 2. 关联设备部件表补充查询巡检部位和产线数据 3. 增加按产线过滤巡检记录的查询条件 4. 优化日巡检页面:替换日期选择器为时间段选择,新增负责人汇总统计、应检/实检差异统计和完成率指标
This commit is contained in:
@@ -65,6 +65,11 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity {
|
||||
*/
|
||||
private String photo;
|
||||
|
||||
/**
|
||||
* 产线
|
||||
*/
|
||||
private String productionLine;
|
||||
|
||||
/**
|
||||
* 巡检时间开始
|
||||
*/
|
||||
|
||||
@@ -84,5 +84,15 @@ public class EqpEquipmentInspectionRecordVo {
|
||||
*/
|
||||
private String checkStandard;
|
||||
|
||||
/**
|
||||
* 巡检部位
|
||||
*/
|
||||
private String inspectPart;
|
||||
|
||||
/**
|
||||
* 产线
|
||||
*/
|
||||
private String productionLine;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -58,6 +58,7 @@ public class EqpEquipmentInspectionRecordServiceImpl implements IEqpEquipmentIns
|
||||
qw.eq(bo.getRunStatus() != null, "r.run_status", bo.getRunStatus());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getInspector()), "r.inspector", bo.getInspector());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getAbnormalDesc()), "r.abnormal_desc", bo.getAbnormalDesc());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getProductionLine()), "p.production_line", bo.getProductionLine());
|
||||
qw.ge(bo.getStartInspectTime() != null, "r.inspect_time", bo.getStartInspectTime());
|
||||
qw.le(bo.getEndInspectTime() != null, "r.inspect_time", bo.getEndInspectTime());
|
||||
qw.eq("r.del_flag", 0);
|
||||
|
||||
@@ -33,9 +33,12 @@
|
||||
r.remark,
|
||||
r.photo,
|
||||
c.check_content AS checkContent,
|
||||
c.check_standard AS checkStandard
|
||||
c.check_standard AS checkStandard,
|
||||
p.inspect_part AS inspectPart,
|
||||
p.production_line AS productionLine
|
||||
FROM eqp_equipment_inspection_record r
|
||||
LEFT JOIN eqp_equipment_checklist c ON r.check_id = c.check_id AND c.del_flag = '0'
|
||||
LEFT JOIN eqp_equipment_part p ON c.part_id = p.part_id AND p.del_flag = '0'
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user