art: 设备管理-周保-bug问题处理

zhangherong

2025-04-16 665a719ed52d49422bd4eb145a44dd6810b92565

art: 设备管理-周保-bug问题处理

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java

@@ -98,6 +98,7 @@
    private Date confirmTime;
    /** 确认类型 1 通过  2 驳回 */
    @ApiModelProperty(value = "确认类型")
    @Dict(dicCode = "approved_rejected")
    private String confirmDealType;
    /**保养执行图片;id以逗号分隔*/
    @ApiModelProperty(value = "保养执行图片;id以逗号分隔")
@@ -110,6 +111,7 @@
    private String confirmComment;
    /**初验收人*/
    @ApiModelProperty(value = "初验收人")
    @Dict(dicCode = "sys_user, realname, username")
    private String initialAcceptanceUser;
    /**初验收时间*/
    @ApiModelProperty(value = "初验收时间")
@@ -124,6 +126,7 @@
    private String initialAcceptanceFiles;
    /**终验收人*/
    @ApiModelProperty(value = "终验收人")
    @Dict(dicCode = "sys_user, realname, username")
    private String finalAcceptanceUser;
    /**终验收时间*/
    @ApiModelProperty(value = "终验收时间")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java

@@ -384,6 +384,7 @@
                entity.setConfirmUser(user.getUsername());
                entity.setConfirmComment(request.getConfirmComment());
                entity.setConfirmTime(new Date());
                entity.setConfirmDealType(request.getConfirmDealType());
                if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
                    //驳回
                    userApprovalList = new ArrayList<>();