打卡信息列表调整和会议室管理调整

354798ggg

2023-05-18 e3d738cc6945888fbb92749af67a84c01c02bae1

打卡信息列表调整和会议室管理调整

 src/main/java/com/product/administration/config/SystemCode.java

@@ -268,6 +268,9 @@
    KNOWLEDGE_SHARING_GET_TAG_FAIL("获取知识共享标签失败", ModuleEnum.ORGCOMMON.getValue() + "191"),
    KNOWLEDGE_SHARING_GET_IMAGE_FAIL("获取图片失败", ModuleEnum.ORGCOMMON.getValue() + "192"),


    CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME("会议室保存失败,已存在同名称会议室", ModuleEnum.ADMINISTRAT.getValue() + "193"),
    
    EXPORT_FILE_FAIL("导出文件失败", ModuleEnum.ADMINISTRAT.getValue() + "998"),
    IMPORT_FILE_FAIL("导入文件失败", ModuleEnum.ADMINISTRAT.getValue() + "999"),


 src/main/java/com/product/administration/service/ConferenceManagerService.java

@@ -111,10 +111,21 @@
    @Transactional
    @Override
    public boolean saveConferenceRoom(FieldSetEntity fse) throws BaseException {
        //重名验证对象
        FieldSetEntity nameVerification = null;
        if (StringUtils.isEmpty(fse.getUUID())) {
            fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
        }
            nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=?", new Object[] {fse.getString("room_name")}, false);
        }else {
            nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=? and uuid!=?", new Object[] {fse.getString("room_name"), fse.getUUID()}, false);
        }
        if (nameVerification!=null) {
            throw new BaseException(SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getValue(), SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getText());
        }
        
        BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
        //重名验证
        
        return baseDao.saveFieldSetEntity(fse);
    }


 src/main/java/com/product/administration/service/PunchRecordService.java

@@ -42,6 +42,8 @@
     */
    public DataTableEntity listRecordInfo(FieldSetEntity fse) {
        DataTableEntity dt=baseDao.listTable(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=?", new Object[] {SpringMVCContextHolder.getCurrentUser().getUser_id()}, null, null, fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
        dt.setFieldFormat("punch_time_one", "yyyy-MM-dd HH:mm:ss");
        dt.setFieldFormat("punch_time_three", "yyyy-MM-dd HH:mm:ss");
        baseDao.loadPromptData(dt);
        return dt;
    }