zm
2024-08-14 56d27902f4248a324eaf4f7e851ea0dbf86dedb0
考勤请假申请
已修改2个文件
28 ■■■■■ 文件已修改
src/main/java/com/product/administration/controller/LeaveRequestController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/LeaveRequestService.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/controller/LeaveRequestController.java
@@ -140,6 +140,9 @@
                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
            }
            String uuid = leaveRequestService.saveLeaveRequest(fse);
            if (uuid.equals("1")){
                return error("该时间段已经有请假记录无法保存");
            }
            if (!StringUtils.isEmpty(uuid)) {
                return OK_Add(uuid);
            }
src/main/java/com/product/administration/service/LeaveRequestService.java
@@ -61,16 +61,23 @@
     * 请假申请保存
     */
    public String saveLeaveRequest(FieldSetEntity fs) throws BaseException {
//        fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//公司
//        fs.setValue("fill_in_time", new Date());//填单时间
//        fs.setValue("department_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//部门
        fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());//姓名
        fs.setValue("flow_flag", 0);
        if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
            return baseDao.add(fs);
        DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE, " uuid  not in (?) and user_id=? and ((start_time<=? and end_time>=?) or(start_time<=? and end_time>=?))"
                , new String[]{StringUtils.isEmpty(fs.getUUID())?"":fs.getUUID(), fs.getString("user_id"), fs.getString("start_time"), fs.getString("start_time"), fs.getString("end_time"), fs.getString("end_time")});
        if (dataTableEntity.getRows()>0){
            return "1";
        }else {
            baseDao.update(fs);
            return fs.getString(CmnConst.UUID);
            if (StringUtils.isEmpty(fs.getString(CmnConst.UUID))) {
                fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
                fs.setValue("created_utc_datetime", new Date());
                fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
                return baseDao.add(fs);
            } else {
                fs.setValue("updated_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
                fs.setValue("updated_utc_datetime", new Date());
                baseDao.update(fs);
                return fs.getString(CmnConst.UUID);
            }
        }
    }
    /**