Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-21 ab7ddb13ba6ea769748d1ee67255a53ad7913554

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

@@ -307,7 +307,7 @@
            param.add(meeting_room);
            param.add(meeting_date);
            StringBuilder sb=new StringBuilder();
            sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status, ");
            sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, ");
            sb.append(" (select user_name from product_sys_users where user_id=b.record_man) as record_man,");
            sb.append(" (select user_name from product_sys_users where user_id=b.record_master) as record_master,");
            sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H-%i-%S\"),'~',DATE_FORMAT(b.end_time,\"%H-%i-%S\"))  as time_quantum,");
@@ -429,7 +429,7 @@

        BitMatrix bitMatrix = null;
        try {
           

            bitMatrix = new MultiFormatWriter().encode(content,
                    BarcodeFormat.QR_CODE, width, height, hints);

@@ -444,15 +444,17 @@
    public void CancelAndStart(FieldSetEntity fse) throws BaseException {

        String uuid = fse.getString("uuid");
        String filter=" status='"+uuid+"'";
        String filter=" uuid='"+uuid+"'";
        DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
        FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0);
        if(fieldSetEntity.getString("status").equals("已取消")){
            fieldSetEntity.setValue("status","已启用");
        }else {
            fieldSetEntity.setValue("status","已取消");
        if(product_oa_conference_apply.getRows()!=0){
            FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0);
            if(fieldSetEntity.getString("status").equals("已取消")){
                fieldSetEntity.setValue("status","已启用");
            }else {
                fieldSetEntity.setValue("status","已取消");
            }
            baseDao.update(fieldSetEntity);
        }
        baseDao.update(fieldSetEntity);

    }

@@ -489,8 +491,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 ");