钥匙柜信息处理

rk

3 天以前 57b5984747ea8be414f3c269bd3cefa04b8338ca

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java

@@ -76,6 +76,7 @@
        jkKeys.setEditor(loginUserInfo.getId());
        jkKeys.setIsdeleted(Constants.ZERO);
        jkKeys.setStatus(Constants.ZERO);
        jkKeys.setCarCode(cars.getCode());
        jkKeysMapper.insert(jkKeys);
        return jkKeys.getId();
    }
@@ -136,6 +137,7 @@
        LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
        jkKeys.setEditDate(new Date());
        jkKeys.setEditor(loginUserInfo.getId());
        jkKeys.setCarCode(cars.getCode());
        jkKeysMapper.updateById(jkKeys);
    }

@@ -162,8 +164,16 @@

    @Override
    public List<JkKeys> findList(JkKeys jkKeys) {




        jkKeys.setIsdeleted(Constants.ZERO);
        QueryWrapper<JkKeys> wrapper = new QueryWrapper<>(jkKeys);
        return jkKeysMapper.selectList(wrapper);
        return jkKeysMapper.selectList(new QueryWrapper<JkKeys>()
                .lambda().eq(JkKeys::getIsdeleted,Constants.ZERO)

        );
    }
  
    @Override
@@ -174,12 +184,13 @@
        JkKeys model = pageWrap.getModel();
        MPJLambdaWrapper<JkKeys> wrapper = new MPJLambdaWrapper<JkKeys>()
                .selectAll(JkKeys.class)
                .selectAs(JkCabinetGrid::getCode,JkKeys::getGridCode)
                .selectAs(JkCabinet::getName,JkKeys::getCabinetName)
                .select("j.code",JkKeys::getGridCode)
                .select("j1.name",JkKeys::getCabinetName)
                .leftJoin(Cars.class,Cars::getId,JkKeys::getCarId)
                .leftJoin(JkCabinetGrid.class,JkCabinetGrid::getKeyId,JkKeys::getId)
                .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
                .leftJoin(" jk_cabinet_grid j on j.key_id = t.id and j.isdeleted = 0  ")
                .leftJoin(" jk_cabinet j1 on j.CABINET_ID = j1.id ")
                .eq(JkKeys::getIsdeleted,Constants.ZERO)
//                .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
                .like(StringUtils.isNotBlank(model.getCode()),JkKeys::getCode,model.getCode())
                .like(StringUtils.isNotBlank(model.getCarCode()),JkKeys::getCarCode,model.getCode());
        IPage<JkKeys> iPage = jkKeysMapper.selectJoinPage(page,JkKeys.class,wrapper);