feat(eims): 优化保养报表状态展示

baoshiwei

2025-06-27 88e10f5656a0ad5530a9e37892fb327153d9dc8a

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java

@@ -116,6 +116,11 @@
        qw.like(StringUtils.isNotBlank(bo.getInspName()),"ir.insp_name", bo.getInspName());
        qw.like(bo.getEquName() != null, "equ.equ_name", bo.getEquName());
        qw.like(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
        if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
            qw.and(wq -> wq.like("equ.equ_name", params.get("searchValue"))
                .or().like("equ.asset_no", params.get("searchValue"))
            );
        }
        qw.like(bo.getEquId() != null, "equ.equ_id", bo.getEquId());
        qw.eq(StringUtils.isNotBlank(bo.getInspType()), "ir.insp_type", bo.getInspType());
        qw.eq(bo.getInspUser() != null, "ir.insp_user", bo.getInspUser());
@@ -174,7 +179,7 @@
        Long planId = bo.getPlanId();
        if(planId!=null){
            EimsInspectPlan plan = planMapper.selectById(planId);
            setInspNextTime(plan);
            // setInspNextTime(plan);
            planMapper.updateById(plan);
        }

@@ -244,13 +249,13 @@

    @Override
    public Boolean updateBatchByBo(InspectRecordBo bo) {
        LoginUser loginUser = LoginHelper.getLoginUser();
//        LoginUser loginUser = LoginHelper.getLoginUser();
        List<EimsInspectRecord> inspRecordList = MapstructUtils.convert(bo.getInspRecordList(), EimsInspectRecord.class);
        inspRecordList.forEach(item->{
            // 更新为已点检
            item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y);
            item.setInspTime(new Date());
            item.setInspUser(loginUser.getUserId());
//            item.setInspTime(new Date());
//            item.setInspUser(loginUser.getUserId());
        });
        return baseMapper.updateBatchById(inspRecordList);
    }