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

354798ggg

2023-05-18 e3d738cc6945888fbb92749af67a84c01c02bae1

 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);
    }

@@ -237,9 +248,9 @@
        sql.append(" b.meeting_topic, ");
        sql.append(" b.start_time, ");
        sql.append(" b.end_time, ");
        sql.append(" b.created_by ");
        sql.append(" b.created_by,b.flow_flag ");
        sql.append(" ORDER BY ");
        sql.append(" a.id,b.start_time ");
        sql.append(" b.start_time ");
        DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
        dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
        baseDao.loadPromptData(dt);