art: 设备管理-周保-增加终验收抽检标记字段

zhangherong

2025-05-14 56c963ca36d469bb661144bcabbc55da97c61220

art: 设备管理-周保-增加终验收抽检标记字段

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

@@ -139,9 +139,12 @@
    /**终验收附件*/
    @ApiModelProperty(value = "终验收附件")
    private String finalAcceptanceFiles;
    /**抽检标记*/
    @ApiModelProperty(value = "抽检标记")
    /**初验收抽检标记*/
    @ApiModelProperty(value = "初验收抽检标记")
    private String randomInspectionFlag;
    /**终验收抽检标记*/
    @ApiModelProperty(value = "终验收抽检标记")
    private String finalRandomInspectionFlag;


    //列表展示

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceQuery.java

@@ -18,9 +18,13 @@
    private Date maintenanceDateEnd;
    private String maintenanceStatus;
    /**
     * 抽检标记
     * 初验收抽检标记
     */
    private String randomInspectionFlag;
    /**
     * 终验收抽检标记
     */
    private String finalRandomInspectionFlag;

    private String column;
    private String order;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java

@@ -77,8 +77,8 @@
    /**初验收附件*/
    @ApiModelProperty(value = "初验收附件")
    private List<FileUploadResult> initialAcceptanceFilesResult;
    /**抽检标记*/
    @ApiModelProperty(value = "抽检标记")
    /**初验抽检标记*/
    @ApiModelProperty(value = "初验抽检标记")
    private String randomInspectionFlag;
    //终验收操作
    /**终验收意见*/
@@ -90,4 +90,7 @@
    /**终验收附件*/
    @ApiModelProperty(value = "终验收附件")
    private List<FileUploadResult> finalAcceptanceFilesResult;
    /**终验抽检标记*/
    @ApiModelProperty(value = "终验抽检标记")
    private String finalRandomInspectionFlag;
}

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

@@ -184,7 +184,13 @@
                }else {
                    queryWrapper.and(q -> q.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.random_inspection_flag"));
                }

            }
            if(StringUtils.isNotBlank(query.getFinalRandomInspectionFlag())) {
                if(CommonConstant.DEFAULT_1.equals(query.getFinalRandomInspectionFlag())) {
                    queryWrapper.eq("wmo.final_random_inspection_flag", CommonConstant.DEFAULT_1);
                }else {
                    queryWrapper.and(q -> q.eq("wmo.final_random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.final_random_inspection_flag"));
                }
            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
@@ -475,6 +481,7 @@
                entity.setFinalAcceptanceUser(user.getUsername());
                entity.setFinalAcceptanceComment(request.getFinalAcceptanceComment());
                entity.setFinalAcceptanceTime(new Date());
                entity.setFinalRandomInspectionFlag(request.getFinalRandomInspectionFlag());
                //处理附件
                if (CollectionUtil.isNotEmpty(request.getFinalAcceptanceFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getFinalAcceptanceFilesResult();