18756
2024-08-19 6bc08acfab10b69dd1c53b12076f2dcd92aae2f4
会议室功能预约会议增加与修改8.19
已修改3个文件
76 ■■■■■ 文件已修改
src/main/java/com/product/administration/controller/ConferenceManagerController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/ConferenceManagerService.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
/**
@@ -462,4 +463,25 @@
    }
    @PostMapping("/save_or_update_meeting_info/{version}")
    @ApiVersion(1)
    public String saveOrUpdateMeetingInfo(HttpServletRequest request){
        //获取参数
        FieldSetEntity fse = null;
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
        }
        //判断参数是否为空
        if (bean == null || fse == null) {
            return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
        }
        HashMap hashMap = conferenceManagerService.saveOrUpdateMeetingInfo(fse);
        return OK(hashMap);
    }
}
src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -19,6 +19,8 @@
import com.product.core.websocket.service.WebsocketMesssageServiceThread;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.omg.CORBA.OBJ_ADAPTER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -339,6 +341,55 @@
    }
    @Override
    @Transactional
    public HashMap saveOrUpdateMeetingInfo(FieldSetEntity fse) throws BaseException {
        Date start_time_date = fse.getDate("start_time");
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String format = dateFormat.format(start_time_date);
        String filter=" DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+format.split(" ")[0]+"'";
        DataTableEntity dataTableEntity = baseDao.listTable("product_oa_conference_apply",filter,new Object[]{});
        boolean flag=true;
        for (int i = 0; i < dataTableEntity.getRows(); i++) {
            FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i);
            Date start_time = fse.getDate("start_time");
            Date end_time = fse.getDate("end_time");
            Date start_time1 =fieldSetEntity.getDate("start_time");
            Date end_time1 = fieldSetEntity.getDate("end_time");
            if(start_time1.before(start_time) && end_time1.after(start_time)){
                flag=false;
            }
            if(start_time1.before(end_time) && end_time1.after(end_time)){
                flag=false;
            }
            if(start_time1.after(start_time) && end_time1.before(end_time)){
                flag=false;
            }
        }
        HashMap<String,Object> hashMap=new HashMap<>();
        if(flag==false){
            hashMap.put("code","200");
            hashMap.put("msg","此时间段已被占用");
            hashMap.put("status","sucess");
        }else {
            if(ObjectUtil.isNotEmpty(fse.getValue("uuid"))){
                baseDao.update(fse);
            }else {
                baseDao.add(fse);
            }
            hashMap.put("code","200");
            hashMap.put("msg","成功");
            hashMap.put("status","sucess");
        }
        return hashMap;
    }
    /**
     * 会议室使用情况
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -4,6 +4,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import java.util.HashMap;
import java.util.List;
/**
@@ -36,5 +37,7 @@
   List getMeetingDetails(FieldSetEntity fse)throws  BaseException;
    HashMap saveOrUpdateMeetingInfo(FieldSetEntity fse)throws  BaseException;
}