From 64a00ecca42ffda234197f070734dfe74972635b Mon Sep 17 00:00:00 2001 From: 6c <420680616@qq.com> Date: 星期五, 30 八月 2024 16:08:08 +0800 Subject: [PATCH] 会议室bug --- src/main/java/com/product/administration/service/ConferenceManagerService.java | 535 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 534 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java index 93d99d9..e0c6f5b 100644 --- a/src/main/java/com/product/administration/service/ConferenceManagerService.java +++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java @@ -1,6 +1,15 @@ package com.product.administration.service; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.MultiFormatWriter; +import com.google.zxing.WriterException; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.product.administration.config.CmnConst; import com.product.administration.config.SystemCode; import com.product.administration.service.ide.IConferenceManagerService; @@ -21,8 +30,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.io.IOException; import java.text.DecimalFormat; import java.text.Format; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -200,6 +212,495 @@ return baseDao.delete(fse.getTableName(), fse.getUUID().split(",")); } + @Override + @Transactional + public List getKbData(FieldSetEntity fse) throws BaseException { + + List<Object>param=new ArrayList<>(); + String meeting_date= fse.getString("meeting_date"); + String meeting_resource = fse.getString("meeting_resource"); + param.add(meeting_date); + if(!StringUtils.isEmpty(meeting_resource)){ + String replace_meeting_resource = meeting_resource.replace(",", "%"); + meeting_resource="%"+replace_meeting_resource+"%"; + param.add(meeting_resource); + } + + StringBuilder bs=new StringBuilder(); + bs.append(" SELECT DISTINCT g.room_name,g.uuid as meet_room_uuid,y.* "); + bs.append(" FROM product_oa_conference_room_config g"); + bs.append(" left JOIN product_oa_conference_apply y "); + bs.append(" on y.meeting_room=g.uuid and DATE_FORMAT(y.start_time,\"%Y-%m-%d\")=? "); + if(!StringUtils.isEmpty(meeting_resource)){ + bs.append(" where y.meeting_resource like ? "); + } + bs.append(" ORDER BY y.start_time"); + DataTableEntity dataTableEntity = baseDao.listTable(bs.toString(), param.toArray()); + List<String> list=new ArrayList(); + List<HashMap> listDate=new ArrayList<>(); + + for(int i=0;i<dataTableEntity.getRows();i++){ + FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i); + + //鍒濆鍖栦細璁鐨勪娇鐢ㄧ殑鐘舵�� + String filter=" meeting_room = '"+fieldSetEntity.getString("meeting_room")+"' and DATE_FORMAT(start_time,\"%Y-%m-%d\") ='"+meeting_date+"'"; + DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{}); + for (int i1 = 0; i1 < product_oa_conference_apply.getRows(); i1++) { + FieldSetEntity fieldSetEntity1 = product_oa_conference_apply.getFieldSetEntity(i1); + Date date = new Date(); + if(date.before(fieldSetEntity1.getDate("start_time"))){ + fieldSetEntity1.setValue("status","鏈紑濮�"); + }else if(date.after(fieldSetEntity1.getDate("end_time"))){ + fieldSetEntity1.setValue("status","宸茬粨鏉�"); + }else { + fieldSetEntity1.setValue("status","浼氳涓�"); + } + baseDao.executeUpdate("update product_oa_conference_apply set status='"+fieldSetEntity1.getString("status")+"' where uuid='"+fieldSetEntity1.getString("uuid")+"'"); + } + + if(ObjectUtil.isNotEmpty(fieldSetEntity.getString("uuid"))){ + //鏋勯�犳墍闇�瑕佺殑鏍煎紡 + if(!list.contains(fieldSetEntity.getValue("room_name").toString())){ + HashMap<String,Object> hashMap=new HashMap<>(); + hashMap.put("room_name",fieldSetEntity.getValue("room_name").toString()); + hashMap.put("uuid",fieldSetEntity.getValue("meet_room_uuid").toString()); + Object getStartTime = dataTableEntity.getData().get(0).getValue("start_time"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String time = dateFormat.format(getStartTime); + hashMap.put("start_time",time); + list.add(fieldSetEntity.getValue("room_name").toString()); + listDate.add(hashMap); + + } + fieldSetEntity.setValue("parent",fieldSetEntity.getValue("meet_room_uuid").toString()); + HashMap<String,Object> hashMap=new HashMap<>(); + for (int j = 0; j < fieldSetEntity.getValues().keySet().size(); j++) { + if(fieldSetEntity.getValues().keySet().toArray()[j].toString().equals("start_time") || fieldSetEntity.getValues().keySet().toArray()[j].toString().equals("end_time")){ + Object meeting_time = fieldSetEntity.getValue(fieldSetEntity.getValues().keySet().toArray()[j].toString()); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String time = dateFormat.format(meeting_time); + hashMap.put(fieldSetEntity.getValues().keySet().toArray()[j].toString(),time); + if(fieldSetEntity.getValues().keySet().toArray()[j].equals("start_time")){ + hashMap.put("start_date",time); + }else { + hashMap.put("end_date",time); + } + }else { + hashMap.put(fieldSetEntity.getValues().keySet().toArray()[j].toString(),fieldSetEntity.getValue(fieldSetEntity.getValues().keySet().toArray()[j].toString())); + } + + } + listDate.add(hashMap); + + }else { + if(!list.contains(fieldSetEntity.getValue("room_name").toString())){ + HashMap<String,Object> hashMap=new HashMap<>(); + hashMap.put("room_name",fieldSetEntity.getValue("room_name").toString()); + hashMap.put("uuid",fieldSetEntity.getValue("meet_room_uuid").toString()); + list.add(fieldSetEntity.getValue("room_name").toString()); + listDate.add(hashMap); + } + } + + } + return listDate; + } + + @Override + public List getMeetingDetails(FieldSetEntity fse) throws BaseException { + String meeting_room = fse.getString("meeting_room"); + String meeting_date = fse.getString("meeting_date"); + if(!StringUtils.isEmpty(meeting_room)&&!StringUtils.isEmpty(meeting_date)){ + List<Object>param=new ArrayList<>(); + 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,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,"); + sb.append(" DATE_FORMAT(b.start_time,\"%Y-%m-%d\") as meeting_date,"); + sb.append(" GROUP_CONCAT(b.dict_label SEPARATOR ',') AS meeting_resouces "); + sb.append(" FROM ("); + sb.append(" SELECT DISTINCT a.uuid,a.start_time,a.end_time,a.meeting_topic,a.record_man,a.record_master,a.status,t.dict_label "); + sb.append(" FROM ("); + sb.append(" SELECT T1.*, "); + sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.meeting_resource, ',', T2.digit + 1 ), ',',- 1 ) AS type "); + sb.append(" FROM product_oa_conference_apply T1 "); + sb.append(" LEFT JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ) T2"); + sb.append(" ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )"); + sb.append(" WHERE T1.meeting_room = ? "); + sb.append(" and DATE_FORMAT(T1.start_time,\"%Y-%m-%d\")=? "); + sb.append(" ) a"); + sb.append(" LEFT JOIN product_sys_dict t ON a.type = t.dict_value "); + sb.append(" AND t.dict_name = '浼氳瀹よ祫婧�'"); + sb.append(" )b "); + sb.append(" group by b.uuid,b.start_time,b.end_time,b.meeting_topic,b.record_man,b.record_master,b.status "); + DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray()); + + List dataList =new ArrayList(); + for (int i = 0; i < dataTableEntity.getRows(); i++) { + FieldSetEntity fieldSetEntity = dataTableEntity.getData().get(i); + Map<Object, Object> MapValues = fieldSetEntity.getValues(); + if(ObjectUtil.isNotEmpty(MapValues.get("start_time")) || ObjectUtil.isNotEmpty( MapValues.get("end_time"))){ + Object start_time = MapValues.get("start_time"); + Object end_time = MapValues.get("end_time"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String start_time_date = dateFormat.format(start_time); + String end_time_date = dateFormat.format(end_time); + MapValues.put("start_time",start_time_date); + MapValues.put("end_time",end_time_date); + } + + Date date = new Date(); + //鏄惁鑳藉鍙栨秷 + if(date.before(fieldSetEntity.getDate("start_time"))){ + MapValues.put("isCancel",true); + } + //鏄惁鎵ц寮�鍚姛鑳� + if(date.before(fieldSetEntity.getDate("start_time")) && fieldSetEntity.getString("status").equals("宸插彇娑�")){ + MapValues.put("isStart",true); + } + dataList.add(MapValues); + } + return dataList; + }else { + return null; + } + + } + + @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<>(); + BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse); + 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; + } + + @Override + public BitMatrix getQrCode(String content) throws BaseException, WriterException, IOException { + + //浜岀淮鐮佺殑瀹介珮 + int width = 200; + int height = 200; + + //鍏朵粬鍙傛暟锛屽瀛楃闆嗙紪鐮� + Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>(); + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + //瀹归敊绾у埆涓篐 + hints.put(EncodeHintType.ERROR_CORRECTION , ErrorCorrectionLevel.H); + //鐧借竟鐨勫搴︼紝鍙彇0~4 + hints.put(EncodeHintType.MARGIN , 0); + + BitMatrix bitMatrix = null; + try { + + bitMatrix = new MultiFormatWriter().encode(content, + BarcodeFormat.QR_CODE, width, height, hints); + + } catch (WriterException e) { + e.printStackTrace(); + } + + return bitMatrix; + } + + @Override + public void CancelAndStart(FieldSetEntity fse) throws BaseException { + + String uuid = fse.getString("uuid"); + String filter=" uuid='"+uuid+"'"; + DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{}); + 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); + } + + } + + @Override + public String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException { + + + JSONObject jsonObject = new JSONObject(); + if(!StringUtils.isEmpty(fse.getString("uuid"))&&!StringUtils.isEmpty(fse.getString("date"))){ + String uuid = fse.getString("uuid"); + String date = fse.getString("date"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date parseDate = dateFormat.parse(date); + long between = DateUtil.between(parseDate, new Date(), DateUnit.SECOND); + + if(between>20){ + jsonObject.put("code","200"); + jsonObject.put("msg","浜岀淮鐮佸凡澶辨晥"); + jsonObject.put("status","fail"); + + }else { + + SystemUser currentUser = SpringMVCContextHolder.getCurrentUser(); + FieldSetEntity fieldSetEntity = new FieldSetEntity(); + fieldSetEntity.setTableName("product_oa_conference_sign"); + fieldSetEntity.setValue("sign_user",currentUser.getUser_name()); + fieldSetEntity.setValue("user_id",currentUser.getUser_id()); + fieldSetEntity.setValue("org_level_uuid","00000000-0000-0000-0000-000000000000"); + fieldSetEntity.setValue("organization",currentUser.getDept_uuid()); + fieldSetEntity.setValue("organization_name",currentUser.getCurrentDept().getString("org_level_name")); + fieldSetEntity.setValue("sign_date",new Date()); + fieldSetEntity.setValue("sign_status","宸茬鍒�"); + fieldSetEntity.setValue("meeting_uuid",uuid); + + BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse); + baseDao.add(fieldSetEntity); + jsonObject.put("code","200"); + jsonObject.put("msg","绛惧埌鎴愬姛"); + jsonObject.put("status","sucess"); + } + } + + return jsonObject.toString(); + } + + @Override + public HashMap getSignOrVisitInfo(FieldSetEntity fse) throws BaseException { + + String meeting_uuid = fse.getString("meeting_uuid"); + //type=1灏辨槸绛惧埌鏁版嵁锛宼ype=2灏辨槸璁块棶鏁版嵁 + String type = fse.getString("type"); + List<Object> params=new ArrayList<>(); + params.add(meeting_uuid); + params.add(meeting_uuid); + + StringBuilder sb=new StringBuilder(); + sb.append(" SELECT c.* FROM ( "); + sb.append(" SELECT b.staff_id,b.uuid as meeting_uuid,f.show_name,l.uuid as dept_uuid,l.org_level_name,"); + if(type.equals("1")){ + sb.append(" n.sign_status"); + }else { + sb.append(" n.visit_status"); + } + sb.append(" FROM (" ); + sb.append(" SELECT y.*, "); + sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id"); + sb.append(" FROM product_oa_conference_apply y, "); + sb.append(" ( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x "); + sb.append(" WHERE 1 = 1 "); + sb.append(" AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )"); + sb.append(" and y.uuid= ? "); + sb.append(" )b "); + sb.append(" LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id "); + sb.append(" LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid "); + if(type.equals("1")){ + sb.append(" LEFT JOIN product_oa_conference_sign n "); + }else { + sb.append(" LEFT JOIN product_oa_conference_visit n "); + } + sb.append(" on b.staff_id=n.user_id and n.meeting_uuid=? "); + sb.append(" )c"); + + DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),params.toArray()); + List<HashMap> listDate=new ArrayList<>(); + List<HashMap> listDateSign=new ArrayList<>(); + List<HashMap> listDateNoSign=new ArrayList<>(); + + List<String> list=new ArrayList(); + + int sign_count=0; + int sign_all=0; + int sign_down=0; + HashMap<String,Object> hashMapResult=new HashMap<>(); + for (int i = 0; i < dataTableEntity.getRows(); i++) { + FieldSetEntity fieldSetEntity = dataTableEntity.getFieldSetEntity(i); + + if(!list.contains(fieldSetEntity.getString("org_level_name"))){ + HashMap<String,Object> hashMap=new HashMap<>(); + hashMap.put("dept_uuid",fieldSetEntity.getString("dept_uuid")); + hashMap.put("org_level_name",fieldSetEntity.getString("org_level_name")); + list.add(fieldSetEntity.getString("org_level_name")); + listDate.add(hashMap); + } + + fieldSetEntity.setValue("parent",fieldSetEntity.getString("dept_uuid")); + HashMap<String,Object> hashMap=new HashMap<>(); + for (int j = 0; j < fieldSetEntity.getValues().keySet().size(); j++) { + hashMap.put(fieldSetEntity.getValues().keySet().toArray()[j].toString(),fieldSetEntity.getValue(fieldSetEntity.getValues().keySet().toArray()[j].toString())); + + } + listDate.add(hashMap); + + } + sign_all=listDate.size(); + List<String> list1=new ArrayList(); + List<String> list2=new ArrayList(); + for (int j = 0; j < listDate.size(); j++) { + if((ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("宸茬鍒�")) || (ObjectUtil.isNotEmpty(listDate.get(j).get("visit_status"))&&listDate.get(j).get("visit_status").equals("宸茶闂�")) ){ + if(!list1.contains(listDate.get(j).get("org_level_name"))){ + list1.add(listDate.get(j).get("org_level_name").toString()); + HashMap<String,Object> hashMap=new HashMap<>(); + hashMap.put("dept_uuid",listDate.get(j).get("dept_uuid")); + hashMap.put("org_level_name",listDate.get(j).get("org_level_name")); + listDateSign.add(hashMap); + } + sign_count++; + //閬垮厤閲嶅娣诲姞閮ㄩ棬 + if(listDate.get(j).size()!=2){ + listDateSign.add(listDate.get(j)); + } + + }else { + if(!list2.contains(listDate.get(j).get("org_level_name"))){ + list2.add(listDate.get(j).get("org_level_name").toString()); + HashMap<String,Object> hashMap=new HashMap<>(); + hashMap.put("dept_uuid",listDate.get(j).get("dept_uuid")); + hashMap.put("org_level_name",listDate.get(j).get("org_level_name")); + listDateNoSign.add(hashMap); + } + //閬垮厤閲嶅娣诲姞閮ㄩ棬 + if(listDate.get(j).size()!=2){ + listDateNoSign.add(listDate.get(j)); + } + + + } + } + sign_down=sign_all-sign_count; + hashMapResult.put("signOrvisit_down",sign_count); + hashMapResult.put("no_signOrvisit",sign_down); + hashMapResult.put("listDateNoSignOrVisit",listDateNoSign); + hashMapResult.put("listDateSignOrVisit",listDateSign); + return hashMapResult; + } + + @Override + public void sendMsg(FieldSetEntity fse) throws BaseException { + + String meeting_uuid= fse.getString("meeting_uuid"); + String type = fse.getString("type"); + String user_ids = fse.getString("user_ids"); + + FieldSetEntity product_oa_conference_apply = baseDao.getFieldSetEntity("product_oa_conference_apply", meeting_uuid, false); + + + //姝ゆ柟寮忔槸鏍规嵁鍚庡彴鑷姩缁熻鏈闂汉鍛� + /* List<Object> params=new ArrayList<>(); + params.add(meeting_uuid); + params.add(meeting_uuid); + + StringBuilder sb=new StringBuilder(); + sb.append(" SELECT c.* FROM ( "); + sb.append(" SELECT b.staff_id,b.uuid as meeting_uuid,f.show_name,l.uuid as dept_uuid,l.org_level_name,"); + if(type.equals("1")){ + sb.append(" n.sign_status"); + }else { + sb.append(" n.visit_status"); + } + sb.append(" FROM (" ); + sb.append(" SELECT y.*, "); + sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id"); + sb.append(" FROM product_oa_conference_apply y, "); + sb.append(" ( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x "); + sb.append(" WHERE 1 = 1 "); + sb.append(" AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )"); + sb.append(" and y.uuid= ? "); + sb.append(" )b "); + sb.append(" LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id "); + sb.append(" LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid "); + if(type.equals("1")){ + sb.append(" LEFT JOIN product_oa_conference_sign n "); + }else { + sb.append(" LEFT JOIN product_oa_conference_visit n "); + } + sb.append(" on b.staff_id=n.user_id and n.meeting_uuid=? "); + sb.append(" )c"); + if(type.equals("1")){ + sb.append(" where c.sign_status is NULL"); + }else { + sb.append(" where c.visit_status is NULL"); + } + + DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), params.toArray()); + String user_ids = ""; + for (int i = 0; i < dataTableEntity.getRows(); i++) { + FieldSetEntity fieldSetEntity = dataTableEntity.getFieldSetEntity(i); + if((i+1)==dataTableEntity.getRows()){ + user_ids=user_ids+fieldSetEntity.getString("staff_id"); + }else { + user_ids=user_ids+fieldSetEntity.getString("staff_id")+","; + } + + }*/ + String content=""; + if(type.equals("1")){ + content="浼氳灏嗗紑濮嬬鍒�,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",璇锋寜鏃剁鍒�"; + }else { + content="鎮ㄦ湁鍦轰細璁渶瑕佸弬涓�,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",璇锋煡鐪嬩細璁鎯�"; + } + SystemUser currentUser = SpringMVCContextHolder.getCurrentUser(); + int user_id = currentUser.getUser_id(); + String send_user=user_id+""; + //String reminder_mode = product_oa_conference_apply.getString("reminder_mode"); + /* //鐭俊 + if(reminder_mode.equals("0")){ + } + //閭欢 + if(reminder_mode.equals("1")){ + + } + //绯荤粺娑堟伅 + if(reminder_mode.equals("2")){ + + }*/ + WebsocketMesssageServiceThread.getInstance().appendMessage(user_ids, content, "浼氳鎻愰啋", 1,"1", "", "", send_user, 1, 0, 0); + + } + /** * 浼氳瀹や娇鐢ㄦ儏鍐� @@ -233,8 +734,8 @@ sql.append(" b.end_time, "); } sql.append(" b.flow_flag, "); - sql.append(" FROM "); sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer "); + sql.append(" FROM "); 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 "); @@ -439,6 +940,38 @@ fieldSetEntity.setValue(CmnConst.CREATED_BY, fieldSetEntity.getString(CmnConst.CREATED_BY + "_save_value")); fieldSetEntity.setValue("meetint_type", fieldSetEntity.getString("meetint_type_save_value")); } + + + //瀛樺偍璁块棶璁板綍 + SystemUser currentUser = SpringMVCContextHolder.getCurrentUser(); + String fliter="meeting_uuid='"+fse.getUUID()+"' and user_id='"+currentUser.getUser_id()+"'"; + DataTableEntity product_oa_conference_visit = baseDao.listTable("product_oa_conference_visit", fliter); + + if(product_oa_conference_visit.getRows()!=0){ + FieldSetEntity fieldSetEntity1 = product_oa_conference_visit.getFieldSetEntity(0); + Integer visit_count = fieldSetEntity1.getInteger("visit_count"); + visit_count++; + fieldSetEntity1.setValue("visit_count",visit_count); + fieldSetEntity1.setValue("visit_date_new",new Date()); + baseDao.update(fieldSetEntity1); + }else { + FieldSetEntity fieldSetEntityVisit = new FieldSetEntity(); + fieldSetEntityVisit.setTableName("product_oa_conference_visit"); + fieldSetEntityVisit.setValue("visit_user",currentUser.getUser_name()); + fieldSetEntityVisit.setValue("user_id",currentUser.getUser_id()); + fieldSetEntityVisit.setValue("org_level_uuid","00000000-0000-0000-0000-000000000000"); + fieldSetEntityVisit.setValue("organization",currentUser.getDept_uuid()); + fieldSetEntityVisit.setValue("organization_name",currentUser.getCurrentDept().getString("org_level_name")); + fieldSetEntityVisit.setValue("visit_date_first",new Date()); + fieldSetEntityVisit.setValue("visit_date_new",new Date()); + fieldSetEntityVisit.setValue("visit_count",1); + fieldSetEntityVisit.setValue("visit_status","宸茶闂�"); + fieldSetEntityVisit.setValue("meeting_uuid",fse.getUUID()); + BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fieldSetEntityVisit); + baseDao.add(fieldSetEntityVisit); + } + + return fieldSetEntity; } -- Gitblit v1.9.2