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

zhangherong

2025-05-12 d3749bb6d1cf618ac0c5dafe09160d76dd2d3e26

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

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

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


    //列表展示

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

@@ -17,6 +17,10 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDateEnd;
    private String maintenanceStatus;
    /**
     * 抽检标记
     */
    private String randomInspectionFlag;

    private String column;
    private String order;

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

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

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

@@ -178,6 +178,14 @@
            if (query.getMaintenanceDateBegin() != null && query.getMaintenanceDateEnd() != null) {
                queryWrapper.between("wmo.maintenance_date", query.getMaintenanceDateBegin(), query.getMaintenanceDateEnd());
            }
            if(StringUtils.isNotBlank(query.getRandomInspectionFlag())) {
                if(CommonConstant.DEFAULT_1.equals(query.getRandomInspectionFlag())) {
                    queryWrapper.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_1);
                }else {
                    queryWrapper.and(q -> q.eq("wmo.random_inspection_flag", CommonConstant.DEFAULT_0).or().isNull("wmo.random_inspection_flag"));
                }

            }
            //排序
            if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
                String column = query.getColumn();
@@ -444,6 +452,7 @@
                entity.setInitialAcceptanceUser(user.getUsername());
                entity.setInitialAcceptanceComment(request.getInitialAcceptanceComment());
                entity.setInitialAcceptanceTime(new Date());
                entity.setRandomInspectionFlag(request.getRandomInspectionFlag());
                //处理附件
                if (CollectionUtil.isNotEmpty(request.getInitialAcceptanceFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getInitialAcceptanceFilesResult();