From 9f529d59e088ecf2a7db1e1b1e5a2be4d84c7682 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 十月 2025 18:20:45 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/service/ConferenceManagerService.java |  429 +++++++++++++++--------------------------------------
 1 files changed, 123 insertions(+), 306 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 2412139..f14199d 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -26,6 +26,7 @@
 import com.product.core.transfer.Transactional;
 import com.product.core.websocket.service.WebsocketMesssageServiceThread;
 import com.product.module.sys.entity.SystemUser;
+import com.product.oa.task.service.TaskDistributionService;
 import com.product.util.BaseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,9 +58,11 @@
     QueryFilterService queryFilterService;
     @Autowired
     PermissionService permissionService;
+    @Autowired
+    TaskDistributionService taskDistributionService;
 
     /**
-     * 浼氳瀹ゅ垪琛�
+     * 浼氳瀹ら厤缃垪琛�
      *
      * @param fse
      * @return
@@ -106,7 +109,7 @@
     }
 
     /**
-     * 浼氳瀹よ鎯�
+     * 浼氳瀹ら厤缃鎯�
      *
      * @param fse
      * @return
@@ -117,7 +120,7 @@
     }
 
     /**
-     * 淇濆瓨浼氳瀹�
+     * 淇濆瓨浼氶厤缃瀹�
      *
      * @param fse
      * @return
@@ -137,15 +140,13 @@
         if (nameVerification!=null) {
 			throw new BaseException(SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getValue(), SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getText());
 		}
-
         BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
         //閲嶅悕楠岃瘉
-
         return baseDao.saveFieldSetEntity(fse);
     }
 
     /**
-     * 鍒犻櫎浼氳瀹�
+     * 浼氳瀹ら厤缃垹闄�
      *
      * @param fse
      * @return
@@ -216,7 +217,7 @@
     }
     
     /**
-     * 	浼氳鐪嬫澘鍛ㄤ俊鎭�
+     * 	浼氳鐪嬫澘淇℃伅
      */
     @Override
     @Transactional
@@ -358,116 +359,6 @@
         }
     }
 
-//    @Override
-//    @Transactional
-//    public List getkbData(FieldSetEntity fse) throws BaseException {
-//        List<Object>param=new ArrayList<>();
-//        String meeting_date= fse.getString("meeting_date");
-//        String meeting_date_end= fse.getString("meeting_date_end");
-//        String meeting_resource = fse.getString("meeting_resource");
-//        param.add(meeting_date);
-//        param.add(meeting_date_end);
-//        String replace_meeting_resource="";
-//        if(!StringUtils.isEmpty(meeting_resource)){
-//
-//            String[] split = meeting_resource.split(",");
-//            for (int i = 0; i < split.length; i++) {
-//                if(i!=split.length-1){
-//                    replace_meeting_resource=replace_meeting_resource+"y.meeting_resource like '%"+split[i]+"%' and ";
-//                }else {
-//                    replace_meeting_resource=replace_meeting_resource+"y.meeting_resource like '%"+split[i]+"%'";
-//                }
-//            }
-//        }
-//        StringBuilder bs=new StringBuilder();
-//        bs.append(" SELECT DISTINCT  g.room_name,g.uuid as meet_room_uuid,DATE_FORMAT(y.start_time, \"%d-%m-%Y %H:%i\")  start_time_format,DATE_FORMAT(y.end_time, \"%d-%m-%Y %H:%i\")  end_time_format,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 y.start_time between  ? and ? ");
-//        if(!StringUtils.isEmpty(meeting_resource)){
-//            bs.append(" where ( "+replace_meeting_resource+" )");
-//        }
-//        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 start_time between '"+meeting_date+"'  and '"+meeting_date_end+"'";
-//            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 = null;
-//                    for (int j = 0; j < dataTableEntity.getRows(); j++) {
-//                        FieldSetEntity fieldSetEntity1 = dataTableEntity.getFieldSetEntity(j);
-//                        if(fieldSetEntity1.getString("room_name").equals(hashMap.get("room_name"))){
-//                            getStartTime = fieldSetEntity1.getValue("start_time");
-//                            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm");
-//                            String time = dateFormat.format(getStartTime);
-//                            hashMap.put("start_time",time);
-//                            break;
-//                        }
-//
-//                    }
-//                    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());
-//                    hashMap.put("start_time","");
-//                    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");
@@ -551,56 +442,43 @@
 
     }
 
-    @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 {
-                fse.setValue("status","鏈紑濮�");
-                baseDao.add(fse);
-            }
-            hashMap.put("code","200");
-            hashMap.put("msg","鎴愬姛");
-            hashMap.put("status","sucess");
-        }
-        return hashMap;
-    }
+//    @Override
+//    @Transactional
+//    public void 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(fse);
+//        if(flag==false){
+//        	throw new BaseException("", "鏃堕棿娈佃鍗犵敤");
+//        }
+//        baseDao.saveFieldSetEntity(fse);
+//    }
 
     @Override
     public BitMatrix getQrCode(String content) throws BaseException, WriterException, IOException {
@@ -727,114 +605,6 @@
         return dataTableEntity;
     }
 
-//    @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("\nSELECT c.* FROM ( ");
-//        sb.append("\n  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("\n  FROM (" );
-//        sb.append("\n    SELECT y.*, ");
-//        sb.append("\n      SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id");
-//        sb.append("\n    FROM product_oa_conference_apply y,(SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x ");
-//        sb.append("\n    WHERE 1 = 1 AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )");
-//        sb.append("\n    and y.uuid= ? ");
-//        sb.append("\n  )b ");
-//        sb.append("\n  LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id ");
-//        sb.append("\n  LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid ");
-//        if(type.equals("1")){
-//            sb.append("\n  LEFT JOIN product_oa_conference_sign n ");
-//        }else {
-//            sb.append("\n  LEFT JOIN product_oa_conference_visit n ");
-//        }
-//        sb.append("\n  ON b.staff_id=n.user_id and n.meeting_uuid=? ");
-//        sb.append("\n)c");
-//        // 鑾峰彇浼氳璁块棶/绛惧埌淇℃伅
-//        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), params.toArray());
-//        
-//        // 閮ㄩ棬淇℃伅瀛樺偍
-//        List<HashMap<String, Object>> listDate = new ArrayList<>();
-//        List<HashMap> listDateSign = new ArrayList<>();
-//        List<HashMap> listDateNoSign = new ArrayList<>();
-//        // 鐩稿叧浜哄憳鎵�灞為儴闂�
-//        List<String> listDeptName = new ArrayList<>();
-//
-//        HashMap<String,Object> hashMapResult=new HashMap<>();
-//        
-//        // 閬嶅巻浼氳璁块棶/绛惧埌淇℃伅
-//        for (int i = 0; i < dataTableEntity.getRows(); i++) {
-//            FieldSetEntity fieldSetEntity = dataTableEntity.getFieldSetEntity(i);
-//            // 鏂伴儴闂ㄤ汉鍛�
-//            if(!listDeptName.contains(fieldSetEntity.getString(CmnConst.ORG_LEVEL_NAME))){
-//                HashMap<String,Object> hashMap = new HashMap<>();
-//                hashMap.put(CmnConst.DEPT_UUID, fieldSetEntity.getString(CmnConst.DEPT_UUID));
-//                hashMap.put(CmnConst.ORG_LEVEL_NAME, fieldSetEntity.getString(CmnConst.ORG_LEVEL_NAME));
-//                listDeptName.add(fieldSetEntity.getString(CmnConst.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);
-//
-//        }
-//        int sign_all = listDate.size();
-//        int sign_count=0;
-//        List<String> list1=new ArrayList<>();
-//        List<String> list2=new ArrayList<>();
-//        for (int j = 0; j < listDate.size(); j++) {
-//        	HashMap<String, Object> mapdata = listDate.get(j);
-//            if((ObjectUtil.isNotEmpty(mapdata.get("sign_status")) && mapdata.get("sign_status").equals("宸茬鍒�")) 
-//            		|| (ObjectUtil.isNotEmpty(mapdata.get("visit_status")) && mapdata.get("visit_status").equals("宸茶闂�"))  ){
-//                if(!list1.contains(mapdata.get("org_level_name"))){
-//                    list1.add(mapdata.get("org_level_name").toString());
-//                    HashMap<String,Object> hashMap=new HashMap<>();
-//                    hashMap.put("dept_uuid", mapdata.get("dept_uuid"));
-//                    hashMap.put("org_level_name", mapdata.get("org_level_name"));
-//                    listDateSign.add(hashMap);
-//                }
-//                sign_count++;
-//                //閬垮厤閲嶅娣诲姞閮ㄩ棬
-//                if(mapdata.size()!=2){
-//                    listDateSign.add(mapdata);
-//                }
-//
-//            }else {
-//                if(!list2.contains(mapdata.get("org_level_name"))){
-//                    list2.add(mapdata.get("org_level_name").toString());
-//                    HashMap<String,Object> hashMap=new HashMap<>();
-//                    hashMap.put("dept_uuid", mapdata.get("dept_uuid"));
-//                    hashMap.put("org_level_name", mapdata.get("org_level_name"));
-//                    listDateNoSign.add(hashMap);
-//                }
-//                //閬垮厤閲嶅娣诲姞閮ㄩ棬
-//                if(mapdata.size()!=2){
-//                    listDateNoSign.add(mapdata);
-//                }
-//            }
-//        }
-//        int 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 {
 
@@ -936,43 +706,29 @@
         String startTime = fse.getString("startTime");
         String endTime = fse.getString("endTime");
         StringBuilder sql = new StringBuilder();
-        sql.append(" SELECT ");
-        sql.append(" a.uuid, ");
-        sql.append(" b.uuid apply_uuid, ");
-        sql.append(" a.room_name, ");
-        sql.append(" b.meeting_topic, ");
+        sql.append("\nSELECT ");
+        sql.append("\n  a.uuid,b.uuid apply_uuid,a.room_name,b.meeting_topic, b.flow_flag, ");
         if (com.product.admin.config.CmnConst.MOBILE_CLIENT_TYPE.equalsIgnoreCase(clientType)) {
             //绉诲姩绔�
             sql.append(" date_format(b.start_time,'%Y-%m-%d %H:%i:%s') start_time, ");
             sql.append(" date_format(b.end_time,'%Y-%m-%d %H:%i:%s') end_time, ");
         } else {
-
-            sql.append(" b.start_time, ");
-            sql.append(" b.end_time, ");
+            sql.append(" b.start_time, 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(" 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 ");
-        sql.append("start_time>=? and start_time<=? or (end_time>=? and start_time<=?) ");
-        sql.append(" and start_time is not null and end_time is not null and flow_flag in (1,2) ) b ");
-        sql.append(" ON a.uuid = b.meeting_room ");
-        sql.append(" WHERE ");
-        sql.append(" a.`status` = 1 ");
-        sql.append(" AND org_level_uuid = ? ");
-        sql.append(" AND enabled_time <= now( ) ");
-        sql.append(" GROUP BY ");
-        sql.append(" a.uuid, ");
-        sql.append(" b.uuid, ");
-        sql.append(" a.room_name, ");
-        sql.append(" b.meeting_topic, ");
-        sql.append(" b.start_time, ");
-        sql.append(" b.end_time, ");
-        sql.append(" b.created_by,b.flow_flag ");
-        sql.append(" ORDER BY ");
-        sql.append(" b.start_time ");
+        sql.append("\n  ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
+        sql.append("\nFROM product_oa_CONFERENCE_room_config a ");
+        sql.append("\nLEFT JOIN (");
+        sql.append("\n  SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by ");
+        sql.append("\n  FROM product_oa_conference_apply b ");
+        sql.append("\n  WHERE start_time >= ? and start_time <= ? or (end_time >= ? and start_time <= ?) ");
+        sql.append("\n  and start_time is not null and end_time is not null and flow_flag in (1,2) ");
+        sql.append("\n) b");
+        sql.append("\nON a.uuid = b.meeting_room ");
+        //杩欎釜涓滆タ鍙栨秷浜�
+//        sql.append("\nWHERE a.`status` = 1 AND org_level_uuid = ? AND enabled_time <= now() ");
+        sql.append("\nWHERE a.`status` = 1 AND org_level_uuid = ? ");
+        sql.append("\nGROUP BY a.uuid, b.uuid,a.room_name,b.meeting_topic,b.start_time,b.end_time,b.created_by,b.flow_flag ");
+        sql.append("\nORDER BY b.start_time ");
         DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
         dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
         baseDao.loadPromptData(dt);
@@ -1250,6 +1006,67 @@
     	sbSql.append("\nLEFT JOIN product_oa_conference_apply B ON B.uuid = A.meeting_uuid");
     	return baseDao.listTable(sbSql.toString(), new Object[] {}, fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
     }
+    
+    /**
+     * 	浼氳绾璇︽儏
+     * @param fse
+     * @return
+     */
+    public FieldSetEntity findMeetingMinute(FieldSetEntity fse) {
+    	List<String> param = new ArrayList<>();
+    	String filter = null;
+    	if (StringUtils.isEmpty(fse.getUUID())) {
+			filter = "B.uuid = ?";
+			param.add(fse.getString("meeting_uuid"));
+		} else {
+			filter = "A.uuid = ?";
+			param.add(fse.getUUID());
+		}
+    	StringBuilder sbSql = new StringBuilder();
+    	sbSql.append("\nSELECT ");
+    	sbSql.append("\n  B.uuid AS meeting_uuid,B.meeting_topic,B.meeting_master,B.meeting_recorder,B.participator,CONCAT(start_time,'-',end_time)AS meeting_time, ");
+    	sbSql.append("\n  A.uuid,A.meeting_minute,A.copy_user,A.flow_flag");
+    	sbSql.append("\nFROM product_oa_conference_minute A");
+    	sbSql.append("\nRIGHT JOIN product_oa_conference_apply B ON B.uuid = A.meeting_uuid");
+    	sbSql.append("\nWHERE ").append(filter);
+    	FieldSetEntity fseMeetingMinute = baseDao.getFieldSetEntityBySQL(sbSql.toString(), param.toArray(), false);
+    	baseDao.loadPromptData(fseMeetingMinute);
+    	if(!StringUtils.isEmpty(fseMeetingMinute.getUUID())) {
+    		DataTableEntity dtMeetingMinute = baseDao.listTable("product_oa_conference_minute_sub", "main_uuid = ?", new Object[] {fseMeetingMinute.getUUID()});
+    		fseMeetingMinute.addSubDataTable(dtMeetingMinute);
+    	}
+    	return fseMeetingMinute;
+    }
+    
+    /**
+     * 鑷姩鍙戣捣浠诲姟
+     * @param fse
+     */
+    public void autoMeetingtask(FieldSetEntity fse) {
+    	DataTableEntity dtMeetingMinute = fse.getSubDataTable("product_oa_conference_minute_sub");
+    	if(!BaseUtil.dataTableIsEmpty(dtMeetingMinute)) {
+    		for (int i = 0; i < dtMeetingMinute.getRows(); i++) {
+				FieldSetEntity fseMeetingMinute = dtMeetingMinute.getFieldSetEntity(i);
+				if ("1".equals(fseMeetingMinute.getString("item_task"))) {
+					FieldSetEntity fseOaTask = new FieldSetEntity("product_oa_task_distribution");
+					fseOaTask.setValue("task_name", fseMeetingMinute.getString("item_name"));
+					fseOaTask.setValue("task_description", fseMeetingMinute.getString("item_detail"));
+					fseOaTask.setValue("task_persons", fseMeetingMinute.getString("item_user"));
+					fseOaTask.setValue("owner", fseMeetingMinute.getString("item_mananger"));
+					fseOaTask.setValue("task_start_time", fseMeetingMinute.getString("plan_finish_time"));
+					fseOaTask.setValue("task_finish_time", fseMeetingMinute.getString("plan_start_time"));
+					fseOaTask.setValue("task_source", 1);
+					fseOaTask.setValue("task_status", 1);
+					fseOaTask.setValue("task_complete_sche", 0);
+					fseOaTask.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
+					baseDao.add(fseOaTask);
+					
+					// 鍙戦�佷换鍔℃秷鎭�
+					taskDistributionService.sendTaskMessage(fseOaTask, fseMeetingMinute.getString("item_user"), "admin", 1, fseOaTask.getUUID());
+				}
+			}
+    	}
+    }
 
     public void taskMeetingRminder() {
         DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, " flow_flag=2 and ( to_remind IS NULL OR to_remind = 0 ) AND reminder_time > 0 and reminder_time>=(( UNIX_TIMESTAMP(start_time ) - UNIX_TIMESTAMP( now( ) ) ) / 60) ", new Object[]{});

--
Gitblit v1.9.2