feat(equipment-maintenance): 新增产线字段并完善查询条件与日期格式化

1.  在维修计划实体、BO和VO类中新增产线字段,添加excel导出注解
2.  维修计划列表查询增加产线过滤条件
3.  为维修计划明细的执行日期添加日期格式化注解
This commit is contained in:
2026-07-03 16:56:44 +08:00
parent 00f5abc0db
commit 338d205cc6
6 changed files with 237 additions and 305 deletions

View File

@@ -51,6 +51,10 @@ public class EqpMaintenancePlan extends BaseEntity {
* 审批状态0=草稿 1=待审批 2=已审批 3=已驳回
*/
private Long approvalStatus;
/**
* 产线
*/
private String productionLine;
/**
* 计划开始时间
*/

View File

@@ -36,6 +36,11 @@ public class EqpMaintenancePlanBo extends BaseEntity {
*/
private String planName;
/**
* 产线
*/
private String productionLine;
/**
* 维修类型1=定期保养 2=安全整改 3=专项检修 4=故障维修
*/

View File

@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 维修计划明细业务对象 eqp_maintenance_plan_detail
@@ -43,6 +44,8 @@ public class EqpMaintenancePlanDetailBo extends BaseEntity {
/**
* 单条维修项计划执行日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date itemPlanDate;
/**

View File

@@ -40,6 +40,12 @@ public class EqpMaintenancePlanVo {
@ExcelProperty(value = "计划名称")
private String planName;
/**
* 产线
*/
@ExcelProperty(value = "产线")
private String productionLine;
/**
* 维修类型1=定期保养 2=安全整改 3=专项检修 4=故障维修
*/

View File

@@ -63,6 +63,7 @@ public class EqpMaintenancePlanServiceImpl implements IEqpMaintenancePlanService
LambdaQueryWrapper<EqpMaintenancePlan> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getPlanNo()), EqpMaintenancePlan::getPlanNo, bo.getPlanNo());
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), EqpMaintenancePlan::getPlanName, bo.getPlanName());
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpMaintenancePlan::getProductionLine, bo.getProductionLine());
lqw.eq(bo.getRepairType() != null, EqpMaintenancePlan::getRepairType, bo.getRepairType());
lqw.eq(bo.getPriorityLevel() != null, EqpMaintenancePlan::getPriorityLevel, bo.getPriorityLevel());
lqw.eq(bo.getPlanStatus() != null, EqpMaintenancePlan::getPlanStatus, bo.getPlanStatus());