commit

许鹏程

2024-08-01 da4f7077a96cab425d7710d60624174b10c0c9e2

commit

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

@@ -233,8 +233,8 @@
            sql.append(" b.end_time, ");
        }
        sql.append(" b.flow_flag, ");
        sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
        sql.append(" FROM ");
        sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
        sql.append(" product_oa_CONFERENCE_room_config a ");
        sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM  ");
        sql.append(" product_oa_conference_apply b WHERE ");

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

@@ -225,6 +225,10 @@
            fseJob.setValue("status", 1);
            sysJobService.resumeJob(fse.getString("time_task_uuid"));
        }
        if (StringUtils.isEmpty(fse.getString("time_task_uuid"))) {
            sysJobService.insertJob(fseJob);
            fse.setValue("time_task_uuid", fseJob.getUUID());
        }
        fseJob.setValue("is_conceal", 1);
        fseJob.setValue("uuid", fse.getString("time_task_uuid"));
        sysJobService.updateJob(fseJob);
@@ -251,6 +255,7 @@

    /**
     *     批量修改预警时间
     *
     * @param fse
     * @return
     * @throws SchedulerException
@@ -304,7 +309,6 @@
        Map<String, String> fieldReference = new HashMap<>();    //组合相关字段的参照,tableName1fieldName-->referenceName
        StringBuilder concatField = new StringBuilder();        //组合相关字段,tableName1.fieldName tableName1fieldName
        earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);

        //生成主子表关联SQL
        String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);

@@ -378,6 +382,7 @@

    /**
     * 获取消息接收人
     *
     * @param parent_uuid
     * @return
     */
@@ -457,6 +462,7 @@

    /**
     * 预警反馈-列表
     *
     * @param fse
     * @return
     */